Convert string16 to base::string16 in content.

content/browser/android/content_view_statics.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 <jni.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 44 matching lines @@
     content::RenderProcessHost* host = content::RenderProcessHost::FromID(*it);
     if (host)  // The process might have been killed since it was suspended.
       host->Send(new ViewMsg_SetWebKitSharedTimersSuspended(false));
   }
 }
 
 }  // namespace
 
 // Returns the first substring consisting of the address of a physical location.
 static jstring FindAddress(JNIEnv* env, jclass clazz, jstring addr) {
-  string16 content_16 = ConvertJavaStringToUTF16(env, addr);
-  string16 result_16;
+  base::string16 content_16 = ConvertJavaStringToUTF16(env, addr);
+  base::string16 result_16;
   if (content::address_parser::FindAddress(content_16, &result_16))
     return ConvertUTF16ToJavaString(env, result_16).Release();
   return NULL;
 }
 
 static void SetWebKitSharedTimersSuspended(JNIEnv* env,
                                            jclass obj,
                                            jboolean suspend) {
   std::vector<int>* suspended_processes = g_suspended_processes.Pointer();
   if (suspend) {
     DCHECK(suspended_processes->empty());
     SuspendWebKitSharedTimers(suspended_processes);
   } else {
     ResumeWebkitSharedTimers(*suspended_processes);
     suspended_processes->clear();
   }
 }
 
 namespace content {
 
 bool RegisterWebViewStatics(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content