Adding OverrideStringResource API to ResourceBundle.

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/big_endian.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 290 matching lines @@
   int resource_id = 5;
 
   EXPECT_CALL(delegate, GetLocalizedStringMock(resource_id))
       .Times(1)
       .WillOnce(Return(data));
 
   base::string16 result = resource_bundle->GetLocalizedString(resource_id);
   EXPECT_EQ(data, result);
 }
 
+TEST_F(ResourceBundleTest, OverrideStringResource) {
+  ResourceBundle* resource_bundle = CreateResourceBundle(NULL);
+
+  base::string16 data = base::ASCIIToUTF16("My test data");
+  int resource_id = 5;
+

[grt (UTC plus 2), 2014/06/09 16:54:44]

does it make sense to test that GetLocalizedString returns something other than
"My test data" for id 5 before OverrideStringResource is called?

[jwd, 2014/06/10 20:59:25]

Done, but doesn't test the successful return of actual non-overridden data. The
call before override hits resource_bundle.cc(458) that checks if there are any
loaded resources.

+  resource_bundle->OverrideStringResource(resource_id, data);
+
+  base::string16 result = resource_bundle->GetLocalizedString(resource_id);
+  EXPECT_EQ(data, result);
+}
+
+TEST_F(ResourceBundleTest, DelegateGetLocalizedStringWithOverride) {
+  MockResourceBundleDelegate delegate;
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
+
+  base::string16 delegate_data = base::ASCIIToUTF16("My delegate data");
+  int resource_id = 5;
+
+  EXPECT_CALL(delegate, GetLocalizedStringMock(resource_id))
+      .Times(1)
+      .WillOnce(Return(delegate_data));
+
+  base::string16 override_data = base::ASCIIToUTF16("My override data");
+
+  base::string16 result = resource_bundle->GetLocalizedString(resource_id);
+  EXPECT_EQ(delegate_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) {
   MockResourceBundleDelegate delegate;
   ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
@@ skipping 262 matching lines @@
   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_TRUE(image_skia->image_reps()[0].unscaled());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui