Revert 261566 "device/bluetooth: Rename device::bluetooth_utils:..."

trunk/src/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"
 #include "chromeos/dbus/fake_bluetooth_profile_service_provider.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.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_profile.h"
 #include "device/bluetooth/bluetooth_profile_chromeos.h"
 #include "device/bluetooth/bluetooth_socket.h"
 #include "device/bluetooth/bluetooth_socket_chromeos.h"
-#include "device/bluetooth/bluetooth_uuid.h"
 #include "net/base/io_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothProfile;
 using device::BluetoothSocket;
-using device::BluetoothUUID;
 
 namespace chromeos {
 
 class BluetoothProfileChromeOSTest : public testing::Test {
  public:
   BluetoothProfileChromeOSTest()
       : callback_count_(0),
         error_callback_count_(0),
         profile_callback_count_(0),
         connection_callback_count_(0),
@@ skipping 78 matching lines @@
   BluetoothProfile* last_profile_;
   const BluetoothDevice* last_device_;
   scoped_refptr<BluetoothSocket> last_socket_;
 };
 
 TEST_F(BluetoothProfileChromeOSTest, L2capEndToEnd) {
   // Register the profile and expect the profile object to be passed to the
   // callback.
   BluetoothProfile::Options options;
   BluetoothProfile::Register(
-      BluetoothUUID(FakeBluetoothProfileManagerClient::kL2capUuid),
+      FakeBluetoothProfileManagerClient::kL2capUuid,
       options,
       base::Bind(&BluetoothProfileChromeOSTest::ProfileCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(1U, profile_callback_count_);
   EXPECT_TRUE(last_profile_ != NULL);
   BluetoothProfile* profile = last_profile_;
 
   // Make sure we have a profile service provider for it.
   FakeBluetoothProfileServiceProvider* profile_service_provider =
@@ skipping 105 matching lines @@
       fake_bluetooth_profile_manager_client_->GetProfileServiceProvider(
           FakeBluetoothProfileManagerClient::kL2capUuid);
   EXPECT_TRUE(profile_service_provider == NULL);
 }
 
 TEST_F(BluetoothProfileChromeOSTest, RfcommEndToEnd) {
   // Register the profile and expect the profile object to be passed to the
   // callback.
   BluetoothProfile::Options options;
   BluetoothProfile::Register(
-      BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
+      FakeBluetoothProfileManagerClient::kRfcommUuid,
       options,
       base::Bind(&BluetoothProfileChromeOSTest::ProfileCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(1U, profile_callback_count_);
   EXPECT_TRUE(last_profile_ != NULL);
   BluetoothProfile* profile = last_profile_;
 
   // Make sure we have a profile service provider for it.
   FakeBluetoothProfileServiceProvider* profile_service_provider =
@@ skipping 99 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