chrome.bluetooth API improvements.

device/bluetooth/bluetooth_profile_chromeos_unittest.cc

 // Copyright (c) 2013 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/message_loop/message_loop.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_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
@@ skipping 72 matching lines @@
   void Callback() {
     ++callback_count_;
   }
 
   void ErrorCallback() {
     ++error_callback_count_;
 
     message_loop_.Quit();
   }
 
+  void ConnectToProfileErrorCallback(const std::string error) {
+    ErrorCallback();
+  }
+
   void ProfileCallback(BluetoothProfile* profile) {
     ++profile_callback_count_;
     last_profile_ = profile;
   }
 
   void ConnectionCallback(const BluetoothDevice *device,
                           scoped_refptr<BluetoothSocket> socket) {
     ++connection_callback_count_;
     last_device_ = device;
     last_socket_ = socket;
@@ skipping 45 matching lines @@
   // connection callback to be called with the device we passed and a new
   // socket instance.
   BluetoothDevice* device = adapter_->GetDevice(
       FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_TRUE(device != NULL);
 
   device->ConnectToProfile(
       profile,
       base::Bind(&BluetoothProfileChromeOSTest::Callback,
                  base::Unretained(this)),
-      base::Bind(&BluetoothProfileChromeOSTest::ErrorCallback,
+      base::Bind(&BluetoothProfileChromeOSTest::ConnectToProfileErrorCallback,
                  base::Unretained(this)));
 
   message_loop_.Run();
 
   EXPECT_EQ(1U, callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
 
   EXPECT_EQ(1U, connection_callback_count_);
   EXPECT_EQ(device, last_device_);
   EXPECT_TRUE(last_socket_.get() != NULL);
@@ skipping 105 matching lines @@
   // connection callback to be called with the device we passed and a new
   // socket instance.
   BluetoothDevice* device = adapter_->GetDevice(
       FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_TRUE(device != NULL);
 
   device->ConnectToProfile(
       profile,
       base::Bind(&BluetoothProfileChromeOSTest::Callback,
                  base::Unretained(this)),
-      base::Bind(&BluetoothProfileChromeOSTest::ErrorCallback,
+      base::Bind(&BluetoothProfileChromeOSTest::ConnectToProfileErrorCallback,
                  base::Unretained(this)));
 
   message_loop_.Run();
 
   EXPECT_EQ(1U, callback_count_);
   EXPECT_EQ(0U, error_callback_count_);
 
   EXPECT_EQ(1U, connection_callback_count_);
   EXPECT_EQ(device, last_device_);
   EXPECT_TRUE(last_socket_.get() != NULL);
@@ skipping 68 matching lines @@
   // Unregister the profile, make sure it's no longer registered.
   last_profile_->Unregister();
 
   profile_service_provider =
       fake_bluetooth_profile_manager_client_->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kRfcommUuid);
   EXPECT_TRUE(profile_service_provider == NULL);
 }
 
 }  // namespace chromeos