Replace string16 with base::string16.

chrome/browser/autocomplete/zero_suggest_provider.h

 // 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.
 //
 // This file contains the zero-suggest autocomplete provider. This experimental
 // provider is invoked when the user focuses in the omnibox prior to editing,
 // and generates search query suggestions based on the current URL. To enable
 // this provider, point --experimental-zero-suggest-url-prefix at an
 // appropriate suggestion service.
 //
@@ skipping 58 matching lines @@
 
   // net::URLFetcherDelegate
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Initiates a new fetch for the given |url| of classification
   // |page_classification|. |permanent_text| is the omnibox text
   // for the current page.
   void StartZeroSuggest(
       const GURL& curent_page_url,
       AutocompleteInput::PageClassification page_classification,
-      const string16& permanent_text);
+      const base::string16& permanent_text);
 
   bool field_trial_triggered_in_session() const {
     return field_trial_triggered_in_session_;
   }
 
  private:
   ZeroSuggestProvider(AutocompleteProviderListener* listener,
                       Profile* profile);
 
   virtual ~ZeroSuggestProvider();
@@ skipping 20 matching lines @@
 
   // Creates an AutocompleteMatch with the provided |relevance| and |type| to
   // search |template_url| for |query_string|.  |accepted_suggestion| will be
   // used to generate Assisted Query Stats.
   //
   // Adds this match to |map|; if such a match already exists, whichever one
   // has lower relevance is eliminated.
   void AddMatchToMap(int relevance,
                      AutocompleteMatch::Type type,
                      const TemplateURL* template_url,
-                     const string16& query_string,
+                     const base::string16& query_string,
                      int accepted_suggestion,
                      SearchProvider::MatchMap* map);
 
   // Returns an AutocompleteMatch for a navigational suggestion |navigation|.
   AutocompleteMatch NavigationToMatch(
       const SearchProvider::NavigationResult& navigation);
 
   // Fetches zero-suggest suggestions by sending a request using |suggest_url|.
   void Run(const GURL& suggest_url);
 
@@ skipping 19 matching lines @@
   TemplateURLService* template_url_service_;
 
   // The URL for which a suggestion fetch is pending.
   std::string current_query_;
 
   // The type of page the user is viewing (a search results page doing search
   // term replacement, an arbitrary URL, etc.).
   AutocompleteInput::PageClassification current_page_classification_;
 
   // Copy of OmniboxEditModel::permanent_text_.
-  string16 permanent_text_;
+  base::string16 permanent_text_;
 
   // Fetcher used to retrieve results.
   scoped_ptr<net::URLFetcher> fetcher_;
   // Whether there's a pending request in flight.
   bool have_pending_request_;
 
   // Suggestion for the current URL.
   AutocompleteMatch current_url_match_;
   // Navigation suggestions for the most recent ZeroSuggest input URL.
   SearchProvider::NavigationResults navigation_results_;
@@ skipping 15 matching lines @@
 
   history::MostVisitedURLList most_visited_urls_;
 
   // For callbacks that may be run after destruction.
   base::WeakPtrFactory<ZeroSuggestProvider> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ZeroSuggestProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_ZERO_SUGGEST_PROVIDER_H_