From 57d7bf98ea5f7a08c93c30f5d8a0e303d78ea432 Mon Sep 17 00:00:00 2001
From: Alex Vakulenko <avakulenko@google.com>
Date: Wed, 20 Jan 2016 07:52:34 -0800
Subject: [PATCH] bt: Update libchrome APIs to r369476

The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

Change-Id: I988157d3a6e36ede6561c0fa6919bb756e8ed3dd
---
 service/client/main.cpp                          |  5 +++--
 service/common/bluetooth/util/address_helper.cpp |  4 ++--
 service/common/bluetooth/uuid.cpp                |  6 +++---
 service/ipc/linux_ipc_host.cpp                   | 16 ++++++++--------
 service/test/ipc_linux_unittest.cpp              |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/service/client/main.cpp b/service/client/main.cpp
index 4ba1b20f8..26f0568d8 100644
--- a/service/client/main.cpp
+++ b/service/client/main.cpp
@@ -715,8 +715,9 @@ int main(int argc, char* argv[]) {
       return EXIT_FAILURE;
     }
 
-    vector<string> args;
-    base::SplitString(command, ' ', &args);
+    vector<string> args =
+        base::SplitString(command, " ", base::TRIM_WHITESPACE,
+                          base::SPLIT_WANT_ALL);
 
     if (args.empty())
       continue;
diff --git a/service/common/bluetooth/util/address_helper.cpp b/service/common/bluetooth/util/address_helper.cpp
index 20bb8a44a..51f896273 100644
--- a/service/common/bluetooth/util/address_helper.cpp
+++ b/service/common/bluetooth/util/address_helper.cpp
@@ -34,8 +34,8 @@ bool BdAddrFromString(const std::string& address, bt_bdaddr_t* out_addr) {
   if (address.length() != 17)
     return false;
 
-  std::vector<std::string> byte_tokens;
-  base::SplitString(address, ':', &byte_tokens);
+  std::vector<std::string> byte_tokens = base::SplitString(
+      address, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   if (byte_tokens.size() != 6)
     return false;
diff --git a/service/common/bluetooth/uuid.cpp b/service/common/bluetooth/uuid.cpp
index 8a3443739..575b055c0 100644
--- a/service/common/bluetooth/uuid.cpp
+++ b/service/common/bluetooth/uuid.cpp
@@ -91,13 +91,13 @@ UUID::UUID(std::string uuid) {
     if (uuid[23] != '-')
       return;
 
-    std::vector<std::string> tokens;
-    base::SplitString(uuid, '-', &tokens);
+    std::vector<std::string> tokens = base::SplitString(
+        uuid, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     if (tokens.size() != 5)
       return;
 
-    uuid = JoinString(tokens, "");
+    uuid = base::JoinString(tokens, "");
   }
 
   const int start_index = uuid.size() == 4 ? 2 : 0;
diff --git a/service/ipc/linux_ipc_host.cpp b/service/ipc/linux_ipc_host.cpp
index 832366f60..f0ca34c28 100644
--- a/service/ipc/linux_ipc_host.cpp
+++ b/service/ipc/linux_ipc_host.cpp
@@ -134,8 +134,8 @@ bool LinuxIPCHost::OnAddCharacteristic(const std::string& service_uuid,
                                const std::string& characteristic_uuid,
                                const std::string& control_uuid,
                                const std::string& options) {
-  std::vector<std::string> option_tokens;
-  base::SplitString(options, '.', &option_tokens);
+  std::vector<std::string> option_tokens = base::SplitString(
+      options, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   int properties_mask = 0;
   int permissions_mask = 0;
@@ -187,8 +187,8 @@ bool LinuxIPCHost::OnSetAdvertisement(const std::string& service_uuid,
   LOG_INFO(LOG_TAG, "%s: service:%s uuids:%s data:%s", __func__, service_uuid.c_str(),
            advertise_uuids.c_str(), advertise_data.c_str());
 
-  std::vector<std::string> advertise_uuid_tokens;
-  base::SplitString(advertise_uuids, '.', &advertise_uuid_tokens);
+  std::vector<std::string> advertise_uuid_tokens = base::SplitString(
+      advertise_uuids, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // string -> vector<UUID>
   std::vector<UUID> ids;
@@ -215,8 +215,8 @@ bool LinuxIPCHost::OnSetScanResponse(const std::string& service_uuid,
                              const std::string& scan_response_data,
                              const std::string& manufacturer_data,
                              const std::string& transmit_name) {
-  std::vector<std::string> scan_response_uuid_tokens;
-  base::SplitString(scan_response_uuids, '.', &scan_response_uuid_tokens);
+  std::vector<std::string> scan_response_uuid_tokens = base::SplitString(
+      scan_response_uuids, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // string -> vector<UUID>
   std::vector<UUID> ids;
@@ -267,8 +267,8 @@ bool LinuxIPCHost::OnMessage() {
     return false;
   }
 
-  std::vector<std::string> tokens;
-  base::SplitString(ipc_msg, '|', &tokens);
+  std::vector<std::string> tokens = base::SplitString(
+      ipc_msg, "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   switch (tokens.size()) {
     case 2:
       if (tokens[0] == kSetAdapterNameCommand)
diff --git a/service/test/ipc_linux_unittest.cpp b/service/test/ipc_linux_unittest.cpp
index f472e908e..dfc2693c8 100644
--- a/service/test/ipc_linux_unittest.cpp
+++ b/service/test/ipc_linux_unittest.cpp
@@ -134,13 +134,13 @@ class TestDelegate : public ipc::IPCManager::Delegate,
   void OnIPCHandlerStarted(ipc::IPCManager::Type type) override {
     ASSERT_EQ(ipc::IPCManager::TYPE_LINUX, type);
     started_count_++;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void OnIPCHandlerStopped(ipc::IPCManager::Type type) override {
     ASSERT_EQ(ipc::IPCManager::TYPE_LINUX, type);
     stopped_count_++;
-    base::MessageLoop::current()->Quit();
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
   int started_count() const { return started_count_; }
-- 
2.11.0