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

trunk/src/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc

 // Copyright (c) 2012 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 <string.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
-#include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_discovery_session.h"
 #include "device/bluetooth/test/mock_bluetooth_profile.h"
 #include "device/bluetooth/test/mock_bluetooth_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothDiscoverySession;
 using device::BluetoothOutOfBandPairingData;
 using device::BluetoothProfile;
-using device::BluetoothUUID;
 using device::MockBluetoothAdapter;
 using device::MockBluetoothDevice;
 using device::MockBluetoothDiscoverySession;
 using device::MockBluetoothProfile;
 using extensions::Extension;
 
 namespace utils = extension_function_test_utils;
 namespace api = extensions::api;
 
 namespace {
@@ skipping 512 matching lines @@
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   scoped_refptr<const Extension> extension(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/on_connection")));
   ASSERT_TRUE(extension.get());
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   scoped_refptr<device::MockBluetoothSocket> socket =
       new device::MockBluetoothSocket();
 
-  event_router()->AddProfile(
-      BluetoothUUID("1234"),
-      extension->id(), profile1_.get());
+  event_router()->AddProfile("1234", extension->id(), profile1_.get());
   event_router()->DispatchConnectionEvent(
-      extension->id(), BluetoothUUID("1234"), device1_.get(), socket);
+      extension->id(), "1234", device1_.get(), socket);
 
   listener.Reply("go");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-  event_router()->RemoveProfile(BluetoothUUID("1234"));
+  event_router()->RemoveProfile("1234");
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   BluetoothAdapter::ConstDeviceList devices;
   devices.push_back(device1_.get());
   devices.push_back(device2_.get());
 
@@ skipping 53 matching lines @@
   EXPECT_CALL(*device1_.get(), GetVendorIDSource())
     .WillRepeatedly(testing::Return(BluetoothDevice::VENDOR_ID_BLUETOOTH));
   EXPECT_CALL(*device1_.get(), GetVendorID())
     .WillRepeatedly(testing::Return(0x00E0));
   EXPECT_CALL(*device1_.get(), GetProductID())
     .WillRepeatedly(testing::Return(0x240A));
   EXPECT_CALL(*device1_.get(), GetDeviceID())
     .WillRepeatedly(testing::Return(0x0400));
 
   BluetoothDevice::UUIDList uuids;
-  uuids.push_back(BluetoothUUID("1105"));
-  uuids.push_back(BluetoothUUID("1106"));
+  uuids.push_back("00001105-0000-1000-8000-00805f9b34fb");
+  uuids.push_back("00001106-0000-1000-8000-00805f9b34fb");
 
   EXPECT_CALL(*device1_.get(), GetUUIDs())
       .WillOnce(testing::Return(uuids));
 
   devices.push_back(device1_.get());
 
   // Leave the second largely empty so we can check a device without
   // available information.
   devices.push_back(device2_.get());
 
   EXPECT_CALL(*mock_adapter_, GetDevices())
       .Times(1)
       .WillRepeatedly(testing::Return(devices));
 
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/device_info")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }