Replace string16 with base::string16.

chrome/browser/android/shortcut_helper.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/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"
 
 ShortcutBuilder::ShortcutBuilder(content::WebContents* web_contents,
-                                 const string16& title,
+                                 const base::string16& title,
                                  int launcher_large_icon_size)
     : launcher_large_icon_size_(launcher_large_icon_size),
       shortcut_type_(BOOKMARK) {
   Observe(web_contents);
   url_ = web_contents->GetURL();
   if (title.length() > 0)
     title_ = title;
   else
     title_ = web_contents->GetTitle();
 
@@ skipping 75 matching lines @@
 }
 
 void ShortcutBuilder::Destroy() {
   if (cancelable_task_tracker_.HasTrackedTasks()) {
     cancelable_task_tracker_.TryCancelAll();
   }
   delete this;
 }
 
 void ShortcutHelper::AddShortcut(content::WebContents* web_contents,
-                                 const string16& title,
+                                 const base::string16& title,
                                  int launcher_large_icon_size) {
   // The ShortcutBuilder deletes itself when it's done.
   new ShortcutBuilder(web_contents, title, launcher_large_icon_size);
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShortcutHelper::AddShortcutInBackground(
     const GURL& url,
-    const string16& title,
+    const base::string16& title,
     ShortcutBuilder::ShortcutType shortcut_type,
     const chrome::FaviconBitmapResult& bitmap_result) {
   DCHECK(base::WorkerPool::RunsTasksOnCurrentThread());
 
   // Grab the average color from the bitmap.
   SkColor color = SK_ColorWHITE;
   SkBitmap favicon_bitmap;
   if (bitmap_result.is_valid()) {
     color_utils::GridSampler sampler;
     color = color_utils::CalculateKMeanColorOfPNG(bitmap_result.bitmap_data,
@@ skipping 56 matching lines @@
                         jclass clazz,
                         jlong tab_android_ptr,
                         jstring title,
                         jint launcher_large_icon_size) {
   TabAndroid* tab = reinterpret_cast<TabAndroid*>(tab_android_ptr);
   ShortcutHelper::AddShortcut(
       tab->web_contents(),
       base::android::ConvertJavaStringToUTF16(env, title),
       launcher_large_icon_size);
 }