Prefix string16 with base:: in ui/.

ui/base/resource/resource_bundle_unittest.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/resource/resource_bundle.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 60 matching lines @@
                                     ui::ScaleFactor scale_factor));
   MOCK_METHOD2(GetRawDataResourceMock, base::StringPiece(
       int resource_id,
       ui::ScaleFactor scale_factor));
   virtual bool GetRawDataResource(int resource_id,
                                   ui::ScaleFactor scale_factor,
                                   base::StringPiece* value) OVERRIDE {
     *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;
   }
   MOCK_METHOD1(GetFontMock,
                gfx::Font*(ui::ResourceBundle::FontStyle style));
   virtual scoped_ptr<gfx::Font> GetFont(
       ui::ResourceBundle::FontStyle style) OVERRIDE {
     return scoped_ptr<gfx::Font>(GetFontMock(style));
   }
 };
@@ skipping 197 matching lines @@
 
   base::StringPiece result = resource_bundle->GetRawDataResource(
       resource_id);
   EXPECT_EQ(string_piece.data(), result.data());
 }
 
 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);
 }
 
 #if defined(USE_OZONE) && !defined(USE_PANGO)
 #define MAYBE_DelegateGetFontList DISABLED_DelegateGetFontList
 #else
 #define MAYBE_DelegateGetFontList DelegateGetFontList
 #endif
 
 TEST_F(ResourceBundleTest, MAYBE_DelegateGetFontList) {
@@ skipping 253 matching lines @@
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_default_path, SCALE_FACTOR_NONE);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   EXPECT_EQ(1u, image_skia->image_reps().size());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui