Replace string16 with base::string16.

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 18 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-string16 AutocompleteResultAsString(const AutocompleteResult& result) {
+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(),
                                      match.provider->GetName()));
   }
   return UTF8ToUTF16(output);
 }
 
@@ skipping 80 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"), string16::npos, string16(), GURL(),
+        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
@@ skipping 21 matching lines @@
     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());
-  omnibox_view->SetUserText(string16());
+  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());
   chrome::CloseTab(browser());
   EXPECT_EQ(UTF8ToUTF16(content::kAboutBlankURL), omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
@@ skipping 84 matching lines @@
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
     EXPECT_EQ(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));
   }
 }