Revert of Manage profiles in BluetoothAdapter on ChromeOS

device/bluetooth/bluetooth_socket_chromeos_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
-#include "chromeos/dbus/fake_bluetooth_profile_service_provider.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 #include "device/bluetooth/bluetooth_socket.h"
 #include "device/bluetooth/bluetooth_socket_chromeos.h"
 #include "device/bluetooth/bluetooth_socket_thread.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "net/base/io_buffer.h"
@@ skipping 112 matching lines @@
     ++error_callback_count_;
     last_reason_ = reason;
     last_message_ = error_message;
 
     message_loop_.Quit();
   }
 
   void CreateServiceSuccessCallback(scoped_refptr<BluetoothSocket> socket) {
     ++success_callback_count_;
     last_socket_ = socket;
-
-    if (message_loop_.is_running())
-      message_loop_.Quit();
   }
 
   void AcceptSuccessCallback(const BluetoothDevice* device,
                              scoped_refptr<BluetoothSocket> socket) {
     ++success_callback_count_;
     last_device_ = device;
     last_socket_ = socket;
 
     message_loop_.Quit();
   }
@@ skipping 23 matching lines @@
   BluetoothDevice* device = adapter_->GetDevice(
       FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_TRUE(device != NULL);
 
   device->ConnectToService(
       BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
       base::Bind(&BluetoothSocketChromeOSTest::ConnectToServiceSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
+
   message_loop_.Run();
 
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
   EXPECT_TRUE(last_socket_.get() != NULL);
 
   // Take ownership of the socket for the remainder of the test.
   scoped_refptr<BluetoothSocket> socket = last_socket_;
   last_socket_ = NULL;
   success_callback_count_ = 0;
@@ skipping 89 matching lines @@
 
 TEST_F(BluetoothSocketChromeOSTest, Listen) {
   adapter_->CreateRfcommService(
       BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
       BluetoothAdapter::ServiceOptions(),
       base::Bind(&BluetoothSocketChromeOSTest::CreateServiceSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
 
-  message_loop_.Run();
-
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
   EXPECT_TRUE(last_socket_.get() != NULL);
 
   // Take ownership of the socket for the remainder of the test.
   scoped_refptr<BluetoothSocket> server_socket = last_socket_;
   last_socket_ = NULL;
   success_callback_count_ = 0;
   error_callback_count_ = 0;
 
   // Simulate an incoming connection by just calling the ConnectProfile method
   // of the underlying fake device client (from the BlueZ point of view,
   // outgoing and incoming look the same).
   //
   // This is done before the Accept() call to simulate a pending call at the
   // point that Accept() is called.
   FakeBluetoothDeviceClient* fake_bluetooth_device_client =
       static_cast<FakeBluetoothDeviceClient*>(
           DBusThreadManager::Get()->GetBluetoothDeviceClient());
   BluetoothDevice* device = adapter_->GetDevice(
       FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_TRUE(device != NULL);
   fake_bluetooth_device_client->ConnectProfile(
       static_cast<BluetoothDeviceChromeOS*>(device)->object_path(),
       FakeBluetoothProfileManagerClient::kRfcommUuid,
       base::Bind(&base::DoNothing),
       base::Bind(&DoNothingDBusErrorCallback));
 
-  message_loop_.RunUntilIdle();
-
   server_socket->Accept(
       base::Bind(&BluetoothSocketChromeOSTest::AcceptSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
 
   message_loop_.Run();
 
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
@@ skipping 18 matching lines @@
   error_callback_count_ = 0;
 
   // Run a second connection test, this time calling Accept() before the
   // incoming connection comes in.
   server_socket->Accept(
       base::Bind(&BluetoothSocketChromeOSTest::AcceptSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
 
-  message_loop_.RunUntilIdle();
-
   fake_bluetooth_device_client->ConnectProfile(
       static_cast<BluetoothDeviceChromeOS*>(device)->object_path(),
       FakeBluetoothProfileManagerClient::kRfcommUuid,
       base::Bind(&base::DoNothing),
       base::Bind(&DoNothingDBusErrorCallback));
 
   message_loop_.Run();
 
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
@@ skipping 15 matching lines @@
   EXPECT_EQ(1U, success_callback_count_);
   client_socket = NULL;
   success_callback_count_ = 0;
   error_callback_count_ = 0;
 
   // Now close the server socket.
   server_socket->Disconnect(
       base::Bind(&BluetoothSocketChromeOSTest::ImmediateSuccessCallback,
                  base::Unretained(this)));
 
-  message_loop_.RunUntilIdle();
-
   EXPECT_EQ(1U, success_callback_count_);
 }
 
 TEST_F(BluetoothSocketChromeOSTest, ListenBeforeAdapterStart) {
   // Start off with an invisible adapter, register the profile, then make
   // the adapter visible.
   FakeBluetoothAdapterClient* fake_bluetooth_adapter_client =
       static_cast<FakeBluetoothAdapterClient*>(
           DBusThreadManager::Get()->GetBluetoothAdapterClient());
   fake_bluetooth_adapter_client->SetVisible(false);
 
   adapter_->CreateRfcommService(
       BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
       BluetoothAdapter::ServiceOptions(),
       base::Bind(&BluetoothSocketChromeOSTest::CreateServiceSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
-  message_loop_.Run();
 
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
   EXPECT_TRUE(last_socket_.get() != NULL);
 
   // Take ownership of the socket for the remainder of the test.
   scoped_refptr<BluetoothSocket> socket = last_socket_;
   last_socket_ = NULL;
   success_callback_count_ = 0;
   error_callback_count_ = 0;
 
   // But there shouldn't be a profile registered yet.
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
           DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   FakeBluetoothProfileServiceProvider* profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kRfcommUuid);
   EXPECT_TRUE(profile_service_provider == NULL);
 
   // Make the adapter visible. This should register a profile.
   fake_bluetooth_adapter_client->SetVisible(true);
 
-  message_loop_.RunUntilIdle();
-
   profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kRfcommUuid);
   EXPECT_TRUE(profile_service_provider != NULL);
 
   // Cleanup the socket.
   socket->Disconnect(
       base::Bind(&BluetoothSocketChromeOSTest::ImmediateSuccessCallback,
                  base::Unretained(this)));
 
-  message_loop_.RunUntilIdle();
-
   EXPECT_EQ(1U, success_callback_count_);
 }
 
 TEST_F(BluetoothSocketChromeOSTest, ListenAcrossAdapterRestart) {
   // The fake adapter starts off visible by default.
   FakeBluetoothAdapterClient* fake_bluetooth_adapter_client =
       static_cast<FakeBluetoothAdapterClient*>(
           DBusThreadManager::Get()->GetBluetoothAdapterClient());
 
   adapter_->CreateRfcommService(
       BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
       BluetoothAdapter::ServiceOptions(),
       base::Bind(&BluetoothSocketChromeOSTest::CreateServiceSuccessCallback,
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
-  message_loop_.Run();
 
   EXPECT_EQ(1U, success_callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
   EXPECT_TRUE(last_socket_.get() != NULL);
 
   // Take ownership of the socket for the remainder of the test.
   scoped_refptr<BluetoothSocket> socket = last_socket_;
   last_socket_ = NULL;
   success_callback_count_ = 0;
   error_callback_count_ = 0;
 
   // Make sure the profile was registered with the daemon.
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client =
       static_cast<FakeBluetoothProfileManagerClient*>(
           DBusThreadManager::Get()->GetBluetoothProfileManagerClient());
   FakeBluetoothProfileServiceProvider* profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kRfcommUuid);
   EXPECT_TRUE(profile_service_provider != NULL);
 
   // Make the adapter invisible, and fiddle with the profile fake to unregister
   // the profile since this doesn't happen automatically.
   fake_bluetooth_adapter_client->SetVisible(false);
-
-  message_loop_.RunUntilIdle();
+  fake_bluetooth_profile_manager_client->UnregisterProfile(
+      static_cast<BluetoothSocketChromeOS*>(socket.get())->object_path(),
+      base::Bind(&base::DoNothing),
+      base::Bind(&DoNothingDBusErrorCallback));
 
   // Then make the adapter visible again. This should re-register the profile.
   fake_bluetooth_adapter_client->SetVisible(true);
 
-  message_loop_.RunUntilIdle();
-
   profile_service_provider =
       fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kRfcommUuid);
   EXPECT_TRUE(profile_service_provider != NULL);
 
   // Cleanup the socket.
   socket->Disconnect(
       base::Bind(&BluetoothSocketChromeOSTest::ImmediateSuccessCallback,
                  base::Unretained(this)));
 
-  message_loop_.RunUntilIdle();
-
   EXPECT_EQ(1U, success_callback_count_);
 }
 
 }  // namespace chromeos