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

chrome/browser/autocomplete/autocomplete_browsertest.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 "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
@@ skipping 23 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 base::string16 AutocompleteResultAsString(const AutocompleteResult& result) {
   std::string output(base::StringPrintf("{%" PRIuS "} ", result.size()));
   for (size_t i = 0; i < result.size(); ++i) {
     AutocompleteMatch match = result.match_at(i);
     output.append(base::StringPrintf("[\"%s\" by \"%s\"] ",
-                                     UTF16ToUTF8(match.contents).c_str(),
+                                     base::UTF16ToUTF8(match.contents).c_str(),
                                      match.provider->GetName()));
   }
-  return UTF8ToUTF16(output);
+  return base::UTF8ToUTF16(output);
 }
 
 }  // namespace
 
 class AutocompleteBrowserTest : public ExtensionBrowserTest {
  protected:
   void WaitForTemplateURLServiceToLoad() {
     ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
   }
@@ skipping 13 matching lines @@
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   WaitForTemplateURLServiceToLoad();
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
   // platforms.
 
   location_bar->FocusLocation(true);
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 
-  omnibox_view->SetUserText(ASCIIToUTF16("chrome"));
+  omnibox_view->SetUserText(base::ASCIIToUTF16("chrome"));
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(ASCIIToUTF16("chrome"), omnibox_view->GetText());
+  EXPECT_EQ(base::ASCIIToUTF16("chrome"), omnibox_view->GetText());
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 
   omnibox_view->RevertAll();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 
-  omnibox_view->SetUserText(ASCIIToUTF16("chrome"));
+  omnibox_view->SetUserText(base::ASCIIToUTF16("chrome"));
   location_bar->Revert();
 
   EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 
 // Autocomplete test is flaky on ChromeOS.
 // http://crbug.com/52928
 #if defined(OS_CHROMEOS)
 #define MAYBE_Autocomplete DISABLED_Autocomplete
 #else
 #define MAYBE_Autocomplete Autocomplete
 #endif
@@ skipping 12 matching lines @@
       HistoryServiceFactory::GetForProfile(browser()->profile(),
                                            Profile::EXPLICIT_ACCESS));
 
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
   AutocompleteController* autocomplete_controller = GetAutocompleteController();
 
   {
     omnibox_view->model()->SetInputInProgress(true);
     autocomplete_controller->Start(AutocompleteInput(
-        ASCIIToUTF16("chrome"), base::string16::npos, base::string16(), GURL(),
-        AutocompleteInput::NTP, true, false, true,
+        base::ASCIIToUTF16("chrome"), base::string16::npos, base::string16(),
+        GURL(), AutocompleteInput::NTP, true, false, true,
         AutocompleteInput::SYNCHRONOUS_MATCHES));
 
     EXPECT_TRUE(autocomplete_controller->done());
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
     EXPECT_TRUE(omnibox_view->GetText().empty());
     EXPECT_TRUE(omnibox_view->IsSelectAll());
     const AutocompleteResult& result = autocomplete_controller->result();
     // We get two matches because we have a provider for extension apps and the
     // Chrome Web Store is a built-in Extension app. For this test, we only care
     // about the other match existing.
     ASSERT_GE(result.size(), 1U) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, match.type);
     EXPECT_FALSE(match.deletable);
   }
 
   {
     location_bar->Revert();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+    EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+              omnibox_view->GetText());
     EXPECT_FALSE(omnibox_view->IsSelectAll());
     const AutocompleteResult& result = autocomplete_controller->result();
     EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   WaitForTemplateURLServiceToLoad();
   // http://code.google.com/p/chromium/issues/detail?id=38385
   // Make sure that tabbing away from an empty omnibox causes a revert
   // and select all.
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   omnibox_view->SetUserText(base::string16());
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   chrome::CloseTab(browser());
-  EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+  EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+            omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   WaitForTemplateURLServiceToLoad();
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
 
   // Focus search when omnibox is blank
   {
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
+    EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL),
+              omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
 
     size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(1U, selection_start);
     EXPECT_EQ(1U, selection_end);
   }
 
   // Focus search when omnibox is _not_ alread in forced query mode.
   {
-    omnibox_view->SetUserText(ASCIIToUTF16("foo"));
+    omnibox_view->SetUserText(base::ASCIIToUTF16("foo"));
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("foo"), omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
 
     size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(1U, selection_start);
     EXPECT_EQ(1U, selection_end);
   }
 
   // Focus search when omnibox _is_ already in forced query mode, but no query
   // has been typed.
   {
-    omnibox_view->SetUserText(ASCIIToUTF16("?"));
+    omnibox_view->SetUserText(base::ASCIIToUTF16("?"));
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
 
     size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(1U, selection_start);
     EXPECT_EQ(1U, selection_end);
   }
 
   // Focus search when omnibox _is_ already in forced query mode, and some query
   // has been typed.
   {
-    omnibox_view->SetUserText(ASCIIToUTF16("?foo"));
+    omnibox_view->SetUserText(base::ASCIIToUTF16("?foo"));
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("?foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText());
 
     size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(1U, std::min(selection_start, selection_end));
     EXPECT_EQ(4U, std::max(selection_start, selection_end));
   }
 
   // Focus search when omnibox is in forced query mode with leading whitespace.
   {
-    omnibox_view->SetUserText(ASCIIToUTF16("   ?foo"));
+    omnibox_view->SetUserText(base::ASCIIToUTF16("   ?foo"));
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
 
     size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(4U, std::min(selection_start, selection_end));
     EXPECT_EQ(7U, std::max(selection_start, selection_end));
   }
 }