Prefix string16 with base:: in ui/.

ui/base/l10n/l10n_util_mac.mm

Index: ui/base/l10n/l10n_util_mac.mm
diff --git a/ui/base/l10n/l10n_util_mac.mm b/ui/base/l10n/l10n_util_mac.mm
index e9d47c2dc1e32f97c6d5600c83997093f1097447..b2e3cf852047476f3b023cbe5b6ecd7f6c6568f7 100644
--- a/ui/base/l10n/l10n_util_mac.mm
+++ b/ui/base/l10n/l10n_util_mac.mm
@@ -53,9 +53,9 @@ void OverrideLocaleWithCocoaLocale() {
 
 // Remove the Windows-style accelerator marker and change "..." into an
 // ellipsis.  Returns the result in an autoreleased NSString.
-NSString* FixUpWindowsStyleLabel(const string16& label) {
+NSString* FixUpWindowsStyleLabel(const base::string16& label) {
   const char16 kEllipsisUTF16 = 0x2026;
-  string16 ret;
+  base::string16 ret;
   size_t label_len = label.length();
   ret.reserve(label_len);
   for (size_t i = 0; i < label_len; ++i) {
@@ -87,38 +87,38 @@ NSString* GetNSString(int message_id) {
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a) {
+                       const base::string16& a) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b) {
+                       const base::string16& a,
+                       const base::string16& b) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
-                       const string16& c) {
+                       const base::string16& a,
+                       const base::string16& b,
+                       const base::string16& c) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, c));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
-                       const string16& c,
-                       const string16& d) {
+                       const base::string16& a,
+                       const base::string16& b,
+                       const base::string16& c,
+                       const base::string16& d) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, c, d));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
+                       const base::string16& a,
+                       const base::string16& b,
                        std::vector<size_t>* offsets) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, offsets));
@@ -129,31 +129,31 @@ NSString* GetNSStringWithFixup(int message_id) {
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a) {
+                                const base::string16& a) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b) {
+                                const base::string16& a,
+                                const base::string16& b) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b,
-                                const string16& c) {
+                                const base::string16& a,
+                                const base::string16& b,
+                                const base::string16& c) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b, c));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b,
-                                const string16& c,
-                                const string16& d) {
+                                const base::string16& a,
+                                const base::string16& b,
+                                const base::string16& c,
+                                const base::string16& d) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b, c, d));
 }