Replace string16 with base::string16.

chrome/browser/autocomplete/autocomplete_provider.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 "chrome/browser/autocomplete/autocomplete_provider.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 89 matching lines @@
   DLOG(WARNING) << "The AutocompleteProvider '" << GetName()
                 << "' has not implemented DeleteMatch.";
 }
 
 void AutocompleteProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
 }
 
 void AutocompleteProvider::ResetSession() {
 }
 
-string16 AutocompleteProvider::StringForURLDisplay(const GURL& url,
+base::string16 AutocompleteProvider::StringForURLDisplay(const GURL& url,
                                                    bool check_accept_lang,
                                                    bool trim_http) const {
   std::string languages = (check_accept_lang && profile_) ?
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::string();
   return net::FormatUrl(url, languages,
       net::kFormatUrlOmitAll & ~(trim_http ? 0 : net::kFormatUrlOmitHTTP),
       net::UnescapeRule::SPACES, NULL, NULL, NULL);
 }
 
 AutocompleteProvider::~AutocompleteProvider() {
   Stop(false);
 }
 
 void AutocompleteProvider::UpdateStarredStateOfMatches() {
   if (matches_.empty())
     return;
 
   if (!profile_)
     return;
 
   BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
   if (!bookmark_model || !bookmark_model->loaded())
     return;
 
   for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
     i->starred = bookmark_model->IsBookmarked(i->destination_url);
 }