Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/storage_monitor/storage_monitor_chromeos.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.
 
 // chromeos::StorageMonitorCros implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 40 matching lines @@
   std::string source_path = mount_info.source_path;
 
   const disks::DiskMountManager::Disk* disk =
       disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path);
   if (!disk || disk->device_type() == DEVICE_TYPE_UNKNOWN)
     return false;
 
   std::string unique_id = MakeDeviceUniqueId(*disk);
   // Keep track of device uuid and label, to see how often we receive empty
   // values.
-  base::string16 device_label = UTF8ToUTF16(disk->device_label());
+  base::string16 device_label = base::UTF8ToUTF16(disk->device_label());
   MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, device_label);
   if (unique_id.empty())
     return false;
 
   StorageInfo::Type type = has_dcim ?
       StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
   *info = StorageInfo(StorageInfo::MakeDeviceId(type, unique_id),
                       base::string16(),
                       mount_info.mount_path,
                       device_label,
-                      UTF8ToUTF16(disk->vendor_name()),
-                      UTF8ToUTF16(disk->product_name()),
+                      base::UTF8ToUTF16(disk->vendor_name()),
+                      base::UTF8ToUTF16(disk->product_name()),
                       disk->total_size_in_bytes());
   return true;
 }
 
 // Returns whether the mount point in |mount_info| is a media device or not.
 bool CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   return MediaStorageUtil::HasDcim(base::FilePath(mount_info.mount_path));
 }
@@ skipping 217 matching lines @@
   mount_map_.insert(std::make_pair(mount_info.mount_path, info));
 
   receiver()->ProcessAttach(info);
 }
 
 }  // namespace chromeos
 
 StorageMonitor* StorageMonitor::Create() {
   return new chromeos::StorageMonitorCros();
 }