Replace string16 with base::string16.

chrome/browser/autocomplete/extension_app_provider_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/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ExtensionAppProviderTest : public testing::Test {
  protected:
   struct test_data {
-    const string16 input;
+    const base::string16 input;
     const size_t num_results;
     const GURL output[3];
   };
 
   ExtensionAppProviderTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         history_service_(NULL) { }
   virtual ~ExtensionAppProviderTest() { }
 
   virtual void SetUp() OVERRIDE;
@@ skipping 48 matching lines @@
     info.set_typed_count(kExtensionApps[i].typed_count);
     url_db->AddURL(info);
   }
 }
 
 void ExtensionAppProviderTest::RunTest(
     test_data* keyword_cases,
     int num_cases) {
   ACMatches matches;
   for (int i = 0; i < num_cases; ++i) {
-    AutocompleteInput input(keyword_cases[i].input, string16::npos, string16(),
-                            GURL(), AutocompleteInput::INVALID_SPEC, true,
+    AutocompleteInput input(keyword_cases[i].input, base::string16::npos,
+                            base::string16(), GURL(),
+                            AutocompleteInput::INVALID_SPEC, true,
                             false, true, AutocompleteInput::ALL_MATCHES);
     app_provider_->Start(input, false);
     EXPECT_TRUE(app_provider_->done());
     matches = app_provider_->matches();
     EXPECT_EQ(keyword_cases[i].num_results, matches.size())
         << ASCIIToUTF16("Input was: ") + keyword_cases[i].input;
     if (matches.size() == keyword_cases[i].num_results) {
       for (size_t j = 0; j < keyword_cases[i].num_results; ++j)
         EXPECT_EQ(keyword_cases[i].output[j], matches[j].destination_url);
     }
@@ skipping 28 matching lines @@
 TEST_F(ExtensionAppProviderTest, CreateMatchSanitize) {
   struct TestData {
     const char* name;
     const char* match_contents;
   } cases[] = {
     { "Test", "Test" },
     { "Test \n Test", "Test  Test" },
     { "Test\r\t\nTest", "TestTest" },
   };
 
-  AutocompleteInput input(ASCIIToUTF16("Test"), string16::npos, string16(),
-                          GURL(), AutocompleteInput::INVALID_SPEC, true, true,
+  AutocompleteInput input(ASCIIToUTF16("Test"), base::string16::npos,
+                          base::string16(), GURL(),
+                          AutocompleteInput::INVALID_SPEC, true, true,
                           true, AutocompleteInput::BEST_MATCH);
-  string16 url(ASCIIToUTF16("http://example.com"));
+  base::string16 url(ASCIIToUTF16("http://example.com"));
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     ExtensionAppProvider::ExtensionApp extension_app =
         {ASCIIToUTF16(cases[i].name), url, true};
     AutocompleteMatch match =
         app_provider_->CreateAutocompleteMatch(input,
                                                extension_app,
                                                0,
-                                               string16::npos);
+                                               base::string16::npos);
     EXPECT_EQ(ASCIIToUTF16(cases[i].match_contents), match.contents);
   }
 }