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

chrome/browser/ui/ash/screenshot_taker.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 "chrome/browser/ui/ash/screenshot_taker.h"
 
 #include <climits>
 #include <string>
 
 #include "ash/shell.h"
@@ skipping 64 matching lines @@
 
   // Only cares about HTML because ChromeOS doesn't need other formats.
   // TODO(dcheng): Why don't we take advantage of the ability to write bitmaps
   // to the clipboard here?
   {
     ui::ScopedClipboardWriter scw(ui::Clipboard::GetForCurrentThread(),
                                   ui::CLIPBOARD_TYPE_COPY_PASTE);
     std::string html(kImageClipboardFormatPrefix);
     html += encoded;
     html += kImageClipboardFormatSuffix;
-    scw.WriteHTML(UTF8ToUTF16(html), std::string());
+    scw.WriteHTML(base::UTF8ToUTF16(html), std::string());
   }
   content::RecordAction(content::UserMetricsAction("Screenshot_CopyClipboard"));
 }
 
 void ReadFileAndCopyToClipboardLocal(const base::FilePath& screenshot_path) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   scoped_refptr<base::RefCountedString> png_data(new base::RefCountedString());
   if (!base::ReadFileToString(screenshot_path, &(png_data->data()))) {
     LOG(ERROR) << "Failed to read the screenshot file: "
@@ skipping 407 matching lines @@
           kScreenshotMinimumIntervalInMS);
 }
 
 Notification* ScreenshotTaker::CreateNotification(
     ScreenshotTakerObserver::Result screenshot_result,
     const base::FilePath& screenshot_path) {
   const std::string notification_id(kNotificationId);
   // We cancel a previous screenshot notification, if any, to ensure we get
   // a fresh notification pop-up.
   g_browser_process->notification_ui_manager()->CancelById(notification_id);
-  const base::string16 replace_id(UTF8ToUTF16(notification_id));
+  const base::string16 replace_id(base::UTF8ToUTF16(notification_id));
   bool success =
       (screenshot_result == ScreenshotTakerObserver::SCREENSHOT_SUCCESS);
   message_center::RichNotificationData optional_field;
   if (success) {
     const base::string16 label = l10n_util::GetStringUTF16(
         IDS_MESSAGE_CENTER_NOTIFICATION_BUTTON_COPY_SCREENSHOT_TO_CLIPBOARD);
     optional_field.buttons.push_back(message_center::ButtonInfo(label));
   }
   return new Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
@@ skipping 66 matching lines @@
 }
 
 void ScreenshotTaker::SetScreenshotBasenameForTest(
     const std::string& basename) {
   screenshot_basename_for_test_ = basename;
 }
 
 void ScreenshotTaker::SetScreenshotProfileForTest(Profile* profile) {
   profile_for_test_ = profile;
 }