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

chrome/browser/search_engines/template_url_unittest.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/base_paths.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(ENABLE_RLZ)
 #include "chrome/browser/google/google_util.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/search_engines/search_terms_data_android.h"
 #endif
 
+using base::ASCIIToUTF16;
+
 // TestSearchTermsData --------------------------------------------------------
 
 // Simple implementation of SearchTermsData.
 class TestSearchTermsData : public SearchTermsData {
  public:
   explicit TestSearchTermsData(const std::string& google_base_url);
 
   virtual std::string GoogleBaseURLValue() const OVERRIDE;
 
  private:
@@ skipping 306 matching lines @@
   }
 }
 
 TEST_F(TemplateURLTest, URLRefTermToWide) {
   struct ToWideCase {
     const char* encoded_search_term;
     const base::string16 expected_decoded_term;
   } to_wide_cases[] = {
     {"hello+world", ASCIIToUTF16("hello world")},
     // Test some big-5 input.
-    {"%a7A%A6%6e+to+you", WideToUTF16(L"\x4f60\x597d to you")},
+    {"%a7A%A6%6e+to+you", base::WideToUTF16(L"\x4f60\x597d to you")},
     // Test some UTF-8 input. We should fall back to this when the encoding
     // doesn't look like big-5. We have a '5' in the middle, which is an invalid
     // Big-5 trailing byte.
-    {"%e4%bd%a05%e5%a5%bd+to+you", WideToUTF16(L"\x4f60\x35\x597d to you")},
+    {"%e4%bd%a05%e5%a5%bd+to+you",
+        base::WideToUTF16(L"\x4f60\x35\x597d to you")},
     // Undecodable input should stay escaped.
-    {"%91%01+abcd", WideToUTF16(L"%91%01 abcd")},
+    {"%91%01+abcd", base::WideToUTF16(L"%91%01 abcd")},
     // Make sure we convert %2B to +.
     {"C%2B%2B", ASCIIToUTF16("C++")},
     // C%2B is escaped as C%252B, make sure we unescape it properly.
     {"C%252B", ASCIIToUTF16("C%2B")},
   };
 
   // Set one input encoding: big-5. This is so we can test fallback to UTF-8.
   TemplateURLData data;
   data.SetURL("http://foo?q={searchTerms}");
   data.input_encodings.push_back("big-5");
@@ skipping 81 matching lines @@
 
 // Tests replacing search terms in various encodings and making sure the
 // generated URL matches the expected value.
 TEST_F(TemplateURLTest, ReplaceArbitrarySearchTerms) {
   struct TestData {
     const std::string encoding;
     const base::string16 search_term;
     const std::string url;
     const std::string expected_result;
   } test_data[] = {
-    { "BIG5",  WideToUTF16(L"\x60BD"),
+    { "BIG5",  base::WideToUTF16(L"\x60BD"),
       "http://foo/?{searchTerms}{inputEncoding}",
       "http://foo/?%B1~BIG5" },
     { "UTF-8", ASCIIToUTF16("blah"),
       "http://foo/?{searchTerms}{inputEncoding}",
       "http://foo/?blahUTF-8" },
-    { "Shift_JIS", UTF8ToUTF16("\xe3\x81\x82"),
+    { "Shift_JIS", base::UTF8ToUTF16("\xe3\x81\x82"),
       "http://foo/{searchTerms}/bar",
       "http://foo/%82%A0/bar"},
-    { "Shift_JIS", UTF8ToUTF16("\xe3\x81\x82 \xe3\x81\x84"),
+    { "Shift_JIS", base::UTF8ToUTF16("\xe3\x81\x82 \xe3\x81\x84"),
       "http://foo/{searchTerms}/bar",
       "http://foo/%82%A0%20%82%A2/bar"},
   };
   TemplateURLData data;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
     data.SetURL(test_data[i].url);
     data.input_encodings.clear();
     data.input_encodings.push_back(test_data[i].encoding);
     TemplateURL url(NULL, data);
     EXPECT_TRUE(url.url_ref().IsValid());
@@ skipping 186 matching lines @@
   TemplateURLData data;
   data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
   TemplateURL url(NULL, data);
   EXPECT_TRUE(url.url_ref().IsValid());
   ASSERT_TRUE(url.url_ref().SupportsReplacement());
   GURL result(url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x"))));
   ASSERT_TRUE(result.is_valid());
   std::string expected_url = "http://bar/?";
   if (!rlz_string.empty())
-    expected_url += "rlz=" + UTF16ToUTF8(rlz_string) + "&";
+    expected_url += "rlz=" + base::UTF16ToUTF8(rlz_string) + "&";
   expected_url += "x";
   EXPECT_EQ(expected_url, result.spec());
 }
 
 TEST_F(TemplateURLTest, HostAndSearchTermKey) {
   struct TestData {
     const std::string url;
     const std::string host;
     const std::string path;
     const std::string search_term_key;
@@ skipping 596 matching lines @@
   url.url_ref_.showing_search_terms_ = true;
   search_terms_args.bookmark_bar_pinned = false;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://www.google.com/?bmbp=0&q=foo", result);
 
   url.url_ref_.showing_search_terms_ = true;
   search_terms_args.bookmark_bar_pinned = true;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://www.google.com/?bmbp=1&q=foo", result);
 }