Update uses of UTF conversions in content/ to use the base:: namespace.

content/test/test_webkit_platform_support.cc

 // Copyright 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 "content/test/test_webkit_platform_support.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 144 matching lines @@
     return blink::WebData(red_square, arraysize(red_square));
   }
   return webkit_glue::WebKitPlatformSupportImpl::loadResource(name);
 }
 
 blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name) {
   // Returns placeholder strings to check if they are correctly localized.
   switch (name) {
     case blink::WebLocalizedString::OtherDateLabel:
-      return ASCIIToUTF16("<<OtherDateLabel>>");
+      return base::ASCIIToUTF16("<<OtherDateLabel>>");
     case blink::WebLocalizedString::OtherMonthLabel:
-      return ASCIIToUTF16("<<OtherMonthLabel>>");
+      return base::ASCIIToUTF16("<<OtherMonthLabel>>");
     case blink::WebLocalizedString::OtherTimeLabel:
-      return ASCIIToUTF16("<<OtherTimeLabel>>");
+      return base::ASCIIToUTF16("<<OtherTimeLabel>>");
     case blink::WebLocalizedString::OtherWeekLabel:
-      return ASCIIToUTF16("<<OtherWeekLabel>>");
+      return base::ASCIIToUTF16("<<OtherWeekLabel>>");
     case blink::WebLocalizedString::CalendarClear:
-      return ASCIIToUTF16("<<CalendarClear>>");
+      return base::ASCIIToUTF16("<<CalendarClear>>");
     case blink::WebLocalizedString::CalendarToday:
-      return ASCIIToUTF16("<<CalendarToday>>");
+      return base::ASCIIToUTF16("<<CalendarToday>>");
     case blink::WebLocalizedString::ThisMonthButtonLabel:
-      return ASCIIToUTF16("<<ThisMonthLabel>>");
+      return base::ASCIIToUTF16("<<ThisMonthLabel>>");
     case blink::WebLocalizedString::ThisWeekButtonLabel:
-      return ASCIIToUTF16("<<ThisWeekLabel>>");
+      return base::ASCIIToUTF16("<<ThisWeekLabel>>");
     case blink::WebLocalizedString::WeekFormatTemplate:
-      return ASCIIToUTF16("Week $2, $1");
+      return base::ASCIIToUTF16("Week $2, $1");
     default:
       return WebKitPlatformSupportImpl::queryLocalizedString(name);
   }
 }
 
 blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     const blink::WebString& value) {
   if (name == blink::WebLocalizedString::ValidationRangeUnderflow)
-    return ASCIIToUTF16("range underflow");
+    return base::ASCIIToUTF16("range underflow");
   if (name == blink::WebLocalizedString::ValidationRangeOverflow)
-    return ASCIIToUTF16("range overflow");
+    return base::ASCIIToUTF16("range overflow");
   return WebKitPlatformSupportImpl::queryLocalizedString(name, value);
 }
 
 blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
     blink::WebLocalizedString::Name name,
     const blink::WebString& value1,
     const blink::WebString& value2) {
   if (name == blink::WebLocalizedString::ValidationTooLong)
-    return ASCIIToUTF16("too long");
+    return base::ASCIIToUTF16("too long");
   if (name == blink::WebLocalizedString::ValidationStepMismatch)
-    return ASCIIToUTF16("step mismatch");
+    return base::ASCIIToUTF16("step mismatch");
   return WebKitPlatformSupportImpl::queryLocalizedString(name, value1, value2);
 }
 
 blink::WebString TestWebKitPlatformSupport::defaultLocale() {
-  return ASCIIToUTF16("en-US");
+  return base::ASCIIToUTF16("en-US");
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 void TestWebKitPlatformSupport::SetThemeEngine(blink::WebThemeEngine* engine) {
   active_theme_engine_ = engine ?
       engine : WebKitPlatformSupportChildImpl::themeEngine();
 }
 
 blink::WebThemeEngine* TestWebKitPlatformSupport::themeEngine() {
   return active_theme_engine_;
@@ skipping 97 matching lines @@
     const blink::WebString& path) {
   base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
 
   std::string buffer;
   base::ReadFileToString(file_path, &buffer);
 
   return blink::WebData(buffer.data(), buffer.size());
 }
 
 }  // namespace content