Prefix string16 with base:: in ui/.

ui/base/resource/resource_bundle_unittest.cc

Index: ui/base/resource/resource_bundle_unittest.cc
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index f6ab49dfbb953bf30fbfc174ff75d3c798298cc4..28c5b02bdbf43aa4177529f3bc292338a59c48d6 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -78,8 +78,9 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
     *value = GetRawDataResourceMock(resource_id, scale_factor);
     return true;
   }
-  MOCK_METHOD1(GetLocalizedStringMock, string16(int message_id));
-  virtual bool GetLocalizedString(int message_id, string16* value) OVERRIDE {
+  MOCK_METHOD1(GetLocalizedStringMock, base::string16(int message_id));
+  virtual bool GetLocalizedString(int message_id,
+                                  base::string16* value) OVERRIDE {
     *value = GetLocalizedStringMock(message_id);
     return true;
   }
@@ -297,14 +298,14 @@ TEST_F(ResourceBundleTest, DelegateGetLocalizedString) {
   MockResourceBundleDelegate delegate;
   ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
-  string16 data = ASCIIToUTF16("My test data");
+  base::string16 data = ASCIIToUTF16("My test data");
   int resource_id = 5;
 
   EXPECT_CALL(delegate, GetLocalizedStringMock(resource_id))
       .Times(1)
       .WillOnce(Return(data));
 
-  string16 result = resource_bundle->GetLocalizedString(resource_id);
+  base::string16 result = resource_bundle->GetLocalizedString(resource_id);
   EXPECT_EQ(data, result);
 }