commit 911d1ae03efec2d54c3b1b605589d790d1745488
author Myles Watson <mylesgw@google.com> Mon Nov 28 16:44:40 2016 -0800
committer Myles Watson <mylesgw@google.com> Fri Dec 02 08:24:45 2016 -0800
tree 4a48f3ace71fe00c6391834158623bd97043126c
parent 9ca07091a1f07ea201cee0504dab6a1d7073d429

Apply clang-format to the rest of the tree

find * | grep "\.[ch]" | xargs clang-format --style=file -i

Test: mma -j32
Change-Id: I6fcc9862bb7bc07c2a367ca58fef2b3cd27a6f05

service/test/gatt_client_unittest.cc

diff --git a/service/test/gatt_client_unittest.cc b/service/test/gatt_client_unittest.cc
index 1628a7b..7527e8b 100644
--- a/service/test/gatt_client_unittest.cc
+++ b/service/test/gatt_client_unittest.cc
@@ -36,8 +36,8 @@
   MOCK_METHOD1(RegisterClient, bt_status_t(bt_uuid_t*));
   MOCK_METHOD1(UnregisterClient, bt_status_t(int));
   MOCK_METHOD1(Scan, bt_status_t(bool));
-  MOCK_METHOD4(Connect, bt_status_t(int , const bt_bdaddr_t *, bool, int));
-  MOCK_METHOD3(Disconnect, bt_status_t(int , const bt_bdaddr_t *, int));
+  MOCK_METHOD4(Connect, bt_status_t(int, const bt_bdaddr_t*, bool, int));
+  MOCK_METHOD3(Disconnect, bt_status_t(int, const bt_bdaddr_t*, int));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockGattHandler);
@@ -50,12 +50,10 @@
 
   void SetUp() override {
     // Only set |mock_handler_| if a previous test case hasn't set it.
-    if (!mock_handler_)
-      mock_handler_.reset(new MockGattHandler());
+    if (!mock_handler_) mock_handler_.reset(new MockGattHandler());
 
     fake_hal_gatt_iface_ = new hal::FakeBluetoothGattInterface(
-        nullptr,
-        nullptr,
+        nullptr, nullptr,
         std::static_pointer_cast<
             hal::FakeBluetoothGattInterface::TestClientHandler>(mock_handler_),
         nullptr);
@@ -93,12 +91,12 @@
 
   auto callback = [&](BLEStatus in_status, const UUID& uuid,
                       std::unique_ptr<BluetoothInstance> in_client) {
-        status = in_status;
-        cb_uuid = uuid;
-        client = std::unique_ptr<GattClient>(
-            static_cast<GattClient*>(in_client.release()));
-        callback_count++;
-      };
+    status = in_status;
+    cb_uuid = uuid;
+    client = std::unique_ptr<GattClient>(
+        static_cast<GattClient*>(in_client.release()));
+    callback_count++;
+  };
 
   UUID uuid0 = UUID::GetRandom();
 
@@ -132,8 +130,8 @@
   // |uuid0| succeeds.
   int client_id0 = 2;  // Pick something that's not 0.
   hal_uuid = uuid0.GetBlueDroid();
-  fake_hal_gatt_iface_->NotifyRegisterClientCallback(
-      BT_STATUS_SUCCESS, client_id0, hal_uuid);
+  fake_hal_gatt_iface_->NotifyRegisterClientCallback(BT_STATUS_SUCCESS,
+                                                     client_id0, hal_uuid);
 
   EXPECT_EQ(1, callback_count);
   ASSERT_TRUE(client.get() != nullptr);  // Assert to terminate in case of error
@@ -152,8 +150,8 @@
   // |uuid1| fails.
   int client_id1 = 3;
   hal_uuid = uuid1.GetBlueDroid();
-  fake_hal_gatt_iface_->NotifyRegisterClientCallback(
-      BT_STATUS_FAIL, client_id1, hal_uuid);
+  fake_hal_gatt_iface_->NotifyRegisterClientCallback(BT_STATUS_FAIL, client_id1,
+                                                     hal_uuid);
 
   EXPECT_EQ(2, callback_count);
   ASSERT_TRUE(client.get() == nullptr);  // Assert to terminate in case of error