Replace string16 with base::string16.

chrome/browser/android/most_visited_sites.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/android/most_visited_sites.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 31 matching lines @@
 class NativeCallback : public base::RefCounted<NativeCallback> {
  public:
   NativeCallback(jobject j_callback_obj, int num_results)
       : num_results_(num_results) {
     JNIEnv* env = AttachCurrentThread();
     j_callback_obj_.Reset(env, j_callback_obj);
   }
 
   void OnMostVisitedURLsAvailable(
       const history::MostVisitedURLList& visited_list) {
-    std::vector<string16> titles;
+    std::vector<base::string16> titles;
     std::vector<std::string> urls;
     ExtractMostVisitedTitlesAndURLs(visited_list, &titles, &urls);
 
     JNIEnv* env = AttachCurrentThread();
     Java_MostVisitedURLsCallback_onMostVisitedURLsAvailable(
         env,
         j_callback_obj_.obj(),
         ToJavaArrayOfStrings(env, titles).obj(),
         ToJavaArrayOfStrings(env, urls).obj());
   }
 
  private:
   friend class base::RefCounted<NativeCallback>;
   ~NativeCallback() {}
 
   void ExtractMostVisitedTitlesAndURLs(
       const history::MostVisitedURLList& visited_list,
-      std::vector<string16>* titles,
+      std::vector<base::string16>* titles,
       std::vector<std::string>* urls) {
     for (size_t i = 0; i < visited_list.size() && i < num_results_; ++i) {
       const history::MostVisitedURL& visited = visited_list[i];
 
       if (visited.url.is_empty())
         break;  // This is the signal that there are no more real visited sites.
 
       titles->push_back(visited.title);
       urls->push_back(visited.url.spec());
     }
@@ skipping 114 matching lines @@
   if (!profile)
     return;
 
   TopSites* top_sites = profile->GetTopSites();
   if (!top_sites)
     return;
 
   std::string url_string = ConvertJavaStringToUTF8(env, j_url);
   top_sites->AddBlacklistedURL(GURL(url_string));
 }