Add base:: to string16 in chrome_frame/.

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 49 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]);
 
-  string16 cf_ua(
+  base::string16 cf_ua(
       ASCIIToWide(http_utils::GetDefaultUserAgentHeaderWithCFTag()));
-  string16 cf_tag(
-      ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
+  base::string16 cf_tag(ASCIIToWide(http_utils::GetChromeFrameUserAgent()));
 
-  EXPECT_NE(string16::npos, cf_ua.find(L"chromeframe/"));
+  EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
   struct TestCase {
-    const string16 original_headers_;
-    const string16 delegate_additional_;
-    const string16 expected_additional_;
+    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",
       L"",
       cf_ua + L"\r\n",
       S_OK },
     { L"Accept: */*\r\n",
       L"",
       L"",
       E_OUTOFMEMORY },
@@ skipping 20 matching lines @@
     wchar_t* additional = NULL;
     test_http.beginning_transaction_ret_ = test.delegate_return_value_;
     test_http.additional_headers_ = test.delegate_additional_.c_str();
     HttpNegotiatePatch::BeginningTransaction(original, &test_http,
         L"http://www.google.com", test.original_headers_.c_str(), 0,
         &additional);
     EXPECT_TRUE(additional != NULL);
 
     if (additional) {
       // Check against the expected additional headers.
-      EXPECT_EQ(test.expected_additional_, string16(additional));
+      EXPECT_EQ(test.expected_additional_, base::string16(additional));
       ::CoTaskMemFree(additional);
     }
   }
 }
 
 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]);
 
-  string16 nocf_ua(
+  base::string16 nocf_ua(
       ASCIIToWide(http_utils::RemoveChromeFrameFromUserAgentValue(
           http_utils::GetDefaultUserAgentHeaderWithCFTag())));
-  string16 cf_ua(
-      ASCIIToWide(http_utils::AddChromeFrameToUserAgentValue(
-          WideToASCII(nocf_ua))));
+  base::string16 cf_ua(ASCIIToWide(
+      http_utils::AddChromeFrameToUserAgentValue(WideToASCII(nocf_ua))));
 
-  EXPECT_EQ(string16::npos, nocf_ua.find(L"chromeframe/"));
-  EXPECT_NE(string16::npos, cf_ua.find(L"chromeframe/"));
+  EXPECT_EQ(base::string16::npos, nocf_ua.find(L"chromeframe/"));
+  EXPECT_NE(base::string16::npos, cf_ua.find(L"chromeframe/"));
 
-  string16 ua_url(L"www.withua.com");
-  string16 no_ua_url(L"www.noua.com");
+  base::string16 ua_url(L"www.withua.com");
+  base::string16 no_ua_url(L"www.noua.com");
 
   RegistryListPreferencesHolder& ua_holder =
       GetUserAgentPreferencesHolderForTesting();
   ua_holder.AddStringForTesting(no_ua_url);
 
   struct TestCase {
-    const string16 url_;
-    const string16 original_headers_;
-    const string16 delegate_additional_;
-    const string16 expected_additional_;
+    const base::string16 url_;
+    const base::string16 original_headers_;
+    const base::string16 delegate_additional_;
+    const base::string16 expected_additional_;
   } test_cases[] = {
     { ua_url,
       L"",
       L"Accept: */*\r\n" + cf_ua + L"\r\n",
       L"Accept: */*\r\n" + cf_ua + L"\r\n" },
     { ua_url,
       L"",
       L"Accept: */*\r\n" + nocf_ua + L"\r\n",
       L"Accept: */*\r\n" + cf_ua + L"\r\n" },
     { no_ua_url,
@@ skipping 11 matching lines @@
     wchar_t* additional = NULL;
     test_http.beginning_transaction_ret_ = S_OK;
     test_http.additional_headers_ = test.delegate_additional_.c_str();
     HttpNegotiatePatch::BeginningTransaction(original, &test_http,
         test.url_.c_str(), test.original_headers_.c_str(), 0,
         &additional);
     EXPECT_TRUE(additional != NULL);
 
     if (additional) {
       // Check against the expected additional headers.
-      EXPECT_EQ(test.expected_additional_, string16(additional))
+      EXPECT_EQ(test.expected_additional_, base::string16(additional))
           << "Iteration: " << i;
       ::CoTaskMemFree(additional);
     }
   }
 }
 
 
 class TestInternetProtocolSink
     : public CComObjectRootEx<CComMultiThreadModel>,
       public IInternetProtocolSink {
@@ skipping 40 matching lines @@
 
   STDMETHOD(ReportResult)(HRESULT hr, DWORD err, LPCWSTR result) {
     NOTREACHED();
     return S_OK;
   }
 
   ULONG last_status() const {
     return status_;
   }
 
-  const string16& last_status_text() const {
+  const base::string16& last_status_text() const {
     return status_text_;
   }
 
  protected:
   ULONG status_;
-  string16 status_text_;
+  base::string16 status_text_;
   base::win::ScopedComPtr<IWebBrowser2> browser_;
 };
 
 using testing::AllOf;
 using testing::ContainsRegex;
 using testing::HasSubstr;
 
 TEST(AppendUserAgent, Append) {
   EXPECT_THAT(AppendCFUserAgentString(NULL, NULL),
       testing::ContainsRegex("User-Agent:.+chromeframe.+\r\n"));
@@ skipping 14 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")));
 }