Add base:: namespace to straggling string16s left in chrome/browser/ui.

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 175 matching lines @@
   }
 
   InstantSearchPrerenderer* GetInstantSearchPrerenderer() {
     return instant_service_->instant_search_prerenderer();
   }
 
   const GURL& GetPrerenderURL() {
     return GetInstantSearchPrerenderer()->prerender_url_;
   }
 
-  void SetLastQuery(const string16& query) {
+  void SetLastQuery(const base::string16& query) {
     GetInstantSearchPrerenderer()->last_instant_suggestion_ =
         InstantSuggestion(query, std::string());
   }
 
   content::WebContents* prerender_contents() {
     return GetInstantSearchPrerenderer()->prerender_contents();
   }
 
   bool MessageWasSent(uint32 id) {
     content::MockRenderProcessHost* process =
         static_cast<content::MockRenderProcessHost*>(
             prerender_contents()->GetRenderViewHost()->GetProcess());
     return process->sink().GetFirstMessageMatching(id) != NULL;
   }
 
   content::WebContents* GetActiveWebContents() const {
     return browser()->tab_strip_model()->GetWebContentsAt(0);
   }
 
   PrerenderHandle* prerender_handle() {
     return GetInstantSearchPrerenderer()->prerender_handle_.get();
   }
 
-  void PrerenderSearchQuery(const string16& query) {
+  void PrerenderSearchQuery(const base::string16& query) {
     Init(true, true);
     InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
     prerenderer->Prerender(InstantSuggestion(query, std::string()));
     CommitPendingLoad(&prerender_contents()->GetController());
     EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), query));
     EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
   }
 };
 
 TEST_F(InstantSearchPrerendererTest, GetSearchTermsFromPrerenderedPage) {
@@ skipping 32 matching lines @@
   prerenderer->Prerender(
       InstantSuggestion(ASCIIToUTF16("flowers"), std::string()));
   EXPECT_EQ("", UTF16ToASCII(prerenderer->get_last_query()));
   EXPECT_FALSE(MessageWasSent(
       ChromeViewMsg_SearchBoxSetSuggestionToPrefetch::ID));
 }
 
 TEST_F(InstantSearchPrerendererTest, CanCommitQuery) {
   Init(true, true);
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
-  string16 query = ASCIIToUTF16("flowers");
+  base::string16 query = ASCIIToUTF16("flowers");
   prerenderer->Prerender(InstantSuggestion(query, std::string()));
   EXPECT_TRUE(prerenderer->CanCommitQuery(GetActiveWebContents(), query));
 
   // Make sure InstantSearchPrerenderer::CanCommitQuery() returns false for
   // invalid search queries.
   EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(),
                                            ASCIIToUTF16("joy")));
-  EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(), string16()));
+  EXPECT_FALSE(prerenderer->CanCommitQuery(GetActiveWebContents(),
+                                           base::string16()));
 }
 
 TEST_F(InstantSearchPrerendererTest, CommitQuery) {
-  string16 query = ASCIIToUTF16("flowers");
+  base::string16 query = ASCIIToUTF16("flowers");
   PrerenderSearchQuery(query);
   InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer();
   prerenderer->Commit(query);
   EXPECT_TRUE(MessageWasSent(ChromeViewMsg_SearchBoxSubmit::ID));
 }
 
 TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) {
   Init(true, true);
   EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 
@@ skipping 96 matching lines @@
   // Open a search results page. Make sure the InstantSearchPrerenderer cancels
   // the active prerender request upon the receipt of empty search query.
   GURL url("https://www.google.com/alt#quux=&strk");
   browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
                                             content::PAGE_TRANSITION_TYPED,
                                             false));
   EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
   EXPECT_EQ(url, GetActiveWebContents()->GetURL());
   EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
 }