Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media…

device/bluetooth/bluetooth_device.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 "device/bluetooth/bluetooth_device.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "device/bluetooth/bluetooth_utils.h"
 #include "grit/device_bluetooth_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace device {
 
 // static
 bool BluetoothDevice::IsUUIDValid(const std::string& uuid) {
   return !bluetooth_utils::CanonicalUuid(uuid).empty();
 }
 
 BluetoothDevice::BluetoothDevice() {
 }
 
 BluetoothDevice::~BluetoothDevice() {
 }
 
 base::string16 BluetoothDevice::GetName() const {
   std::string name = GetDeviceName();
   if (!name.empty()) {
-    return UTF8ToUTF16(name);
+    return base::UTF8ToUTF16(name);
   } else {
     return GetAddressWithLocalizedDeviceTypeName();
   }
 }
 
 base::string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const {
-  base::string16 address_utf16 = UTF8ToUTF16(GetAddress());
+  base::string16 address_utf16 = base::UTF8ToUTF16(GetAddress());
   BluetoothDevice::DeviceType device_type = GetDeviceType();
   switch (device_type) {
     case DEVICE_COMPUTER:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_COMPUTER,
                                         address_utf16);
     case DEVICE_PHONE:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_PHONE,
                                         address_utf16);
     case DEVICE_MODEM:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_MODEM,
@@ skipping 133 matching lines @@
   for (BluetoothDevice::ServiceList::const_iterator iter = services.begin();
        iter != services.end();
        ++iter) {
     if (bluetooth_utils::CanonicalUuid(*iter) == canonical_uuid)
       return true;
   }
   return false;
 }
 
 }  // namespace device