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

content/shell/common/webkit_test_helpers.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 "content/shell/common/webkit_test_helpers.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 56 matching lines @@
   prefs->java_enabled = false;
   prefs->application_cache_enabled = true;
   prefs->tabs_to_links = false;
   prefs->hyperlink_auditing_enabled = false;
   prefs->allow_displaying_insecure_content = true;
   prefs->allow_running_insecure_content = true;
   prefs->webgl_errors_to_console_enabled = false;
   base::string16 serif;
 #if defined(OS_MACOSX)
   prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
-      ASCIIToUTF16("Apple Chancery");
+      base::ASCIIToUTF16("Apple Chancery");
   prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
-      ASCIIToUTF16("Papyrus");
-  serif = ASCIIToUTF16("Times");
+      base::ASCIIToUTF16("Papyrus");
+  serif = base::ASCIIToUTF16("Times");
 #else
   prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
-      ASCIIToUTF16("Comic Sans MS");
+      base::ASCIIToUTF16("Comic Sans MS");
   prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
-      ASCIIToUTF16("Impact");
-  serif = ASCIIToUTF16("times new roman");
+      base::ASCIIToUTF16("Impact");
+  serif = base::ASCIIToUTF16("times new roman");
 #endif
   prefs->serif_font_family_map[webkit_glue::kCommonScript] =
       serif;
   prefs->standard_font_family_map[webkit_glue::kCommonScript] =
       serif;
   prefs->fixed_font_family_map[webkit_glue::kCommonScript] =
-      ASCIIToUTF16("Courier");
+      base::ASCIIToUTF16("Courier");
   prefs->sans_serif_font_family_map[
-      webkit_glue::kCommonScript] = ASCIIToUTF16("Helvetica");
+      webkit_glue::kCommonScript] = base::ASCIIToUTF16("Helvetica");
   prefs->minimum_logical_font_size = 9;
   prefs->asynchronous_spell_checking_enabled = false;
   prefs->threaded_html_parser = true;
   prefs->accelerated_2d_canvas_enabled =
       command_line.HasSwitch(switches::kEnableAccelerated2DCanvas);
   prefs->force_compositing_mode =
       command_line.HasSwitch(switches::kForceCompositingMode);
   prefs->accelerated_compositing_for_video_enabled = false;
   prefs->mock_scrollbars_enabled = false;
   prefs->fixed_position_creates_stacking_context = false;
   prefs->smart_insert_delete_enabled = true;
   prefs->minimum_accelerated_2d_canvas_size = 0;
 #if defined(OS_ANDROID)
   prefs->text_autosizing_enabled = false;
 #endif
   prefs->viewport_enabled = false;
 }
 
 base::FilePath GetWebKitRootDirFilePath() {
   base::FilePath base_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
   return base_path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
 }
 
 }  // namespace content