Prefix string16 with base:: in ui/.

ui/base/l10n/l10n_util_android.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 "ui/base/l10n/l10n_util_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/i18n/rtl.h"
@@ skipping 55 matching lines @@
   std::string variant = GetLocaleComponent(
       locale, uloc_getVariant, ULOC_FULLNAME_CAPACITY);
   return Java_LocalizationUtils_getJavaLocale(env,
           base::android::ConvertUTF8ToJavaString(env, language).obj(),
           base::android::ConvertUTF8ToJavaString(env, country).obj(),
           base::android::ConvertUTF8ToJavaString(env, variant).obj());
 }
 
 }  // namespace
 
-string16 GetDisplayNameForLocale(const std::string& locale,
-                                 const std::string& display_locale) {
+base::string16 GetDisplayNameForLocale(const std::string& locale,
+                                       const std::string& display_locale) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_locale =
       NewJavaLocale(env, locale);
   ScopedJavaLocalRef<jobject> java_display_locale =
       NewJavaLocale(env, display_locale);
 
   ScopedJavaLocalRef<jstring> java_result(
       Java_LocalizationUtils_getDisplayNameForLocale(
           env,
           java_locale.obj(),
           java_display_locale.obj()));
   return ConvertJavaStringToUTF16(java_result);
 }
 
 jstring GetDurationString(JNIEnv* env, jclass clazz, jlong timeInMillis) {
   ScopedJavaLocalRef<jstring> jtime_remaining =
       base::android::ConvertUTF16ToJavaString(
           env,
           ui::TimeFormat::TimeRemaining(
               base::TimeDelta::FromMilliseconds(timeInMillis)));
   return jtime_remaining.Release();
 }
 
 bool RegisterLocalizationUtil(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace l10n_util