Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace.

chrome_frame/test/http_negotiate_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 <atlbase.h>
 #include <atlcom.h>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 50 matching lines @@
 TEST_F(HttpNegotiateTest, BeginningTransaction) {
   static const int kBeginningTransactionIndex = 3;
   CComObjectStackEx<TestHttpNegotiate> test_http;
   IHttpNegotiate_BeginningTransaction_Fn original =
       reinterpret_cast<IHttpNegotiate_BeginningTransaction_Fn>(
           (*reinterpret_cast<void***>(
               static_cast<IHttpNegotiate*>(
                   &test_http)))[kBeginningTransactionIndex]);
 
   base::string16 cf_ua(
-      ASCIIToWide(http_utils::GetDefaultUserAgentHeaderWithCFTag()));
-  base::string16 cf_tag(ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
+      base::ASCIIToWide(http_utils::GetDefaultUserAgentHeaderWithCFTag()));
+  base::string16 cf_tag(
+      base::ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
 
   EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
   struct TestCase {
     const base::string16 original_headers_;
     const base::string16 delegate_additional_;
     const base::string16 expected_additional_;
     HRESULT delegate_return_value_;
   } test_cases[] = {
     { L"Accept: */*\r\n",
@@ skipping 43 matching lines @@
 TEST_F(HttpNegotiateTest, BeginningTransactionUARemoval) {
   static const int kBeginningTransactionIndex = 3;
   CComObjectStackEx<TestHttpNegotiate> test_http;
   IHttpNegotiate_BeginningTransaction_Fn original =
       reinterpret_cast<IHttpNegotiate_BeginningTransaction_Fn>(
           (*reinterpret_cast<void***>(
               static_cast<IHttpNegotiate*>(
                   &test_http)))[kBeginningTransactionIndex]);
 
   base::string16 nocf_ua(
-      ASCIIToWide(http_utils::RemoveChromeFrameFromUserAgentValue(
+      base::ASCIIToWide(http_utils::RemoveChromeFrameFromUserAgentValue(
           http_utils::GetDefaultUserAgentHeaderWithCFTag())));
-  base::string16 cf_ua(ASCIIToWide(
+  base::string16 cf_ua(base::ASCIIToWide(
       http_utils::AddChromeFrameToUserAgentValue(WideToASCII(nocf_ua))));
 
   EXPECT_EQ(base::string16::npos, nocf_ua.find(L"chromeframe/"));
   EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
   base::string16 ua_url(L"www.withua.com");
   base::string16 no_ua_url(L"www.noua.com");
 
   RegistryListPreferencesHolder& ua_holder =
       GetUserAgentPreferencesHolderForTesting();
@@ skipping 130 matching lines @@
 
   // Check additional headers are preserved.
   EXPECT_THAT(AppendCFUserAgentString(NULL,
             L"Authorization: A Zoo That I Ruin\r\n"
             L"User-Agent: Get a Nurse;\r\n"
             L"Accept-Language: Cleanup a Cat Egg\r\n"),
       AllOf(ContainsRegex("User-Agent: Get a Nurse; chromeframe.+\r\n"),
             HasSubstr("Authorization: A Zoo That I Ruin\r\n"),
             HasSubstr("Accept-Language: Cleanup a Cat Egg\r\n")));
 }