Convert string16 to base::string16 in content.

content/browser/android/content_view_statics.cc

Index: content/browser/android/content_view_statics.cc
diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc
index 917da582800a884b481d285305b2626a1481ebee..e176564c4a0f5a430aad40adaddc2d7aef806c05 100644
--- a/content/browser/android/content_view_statics.cc
+++ b/content/browser/android/content_view_statics.cc
@@ -62,8 +62,8 @@ void ResumeWebkitSharedTimers(const std::vector<int>& suspended_processes) {
 
 // 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;