Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: ui/base/resource/resource_bundle_unittest.cc

Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update to address newly added use Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle_ios.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8abb552538c910f598b23896d65a8131721c1234..1dcee7a17d9f82ac4b3cb5dad2d6df046f24c37e 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -74,8 +74,7 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
MOCK_METHOD1(GetImageNamed, gfx::Image(int resource_id));
MOCK_METHOD1(GetNativeImageNamed, gfx::Image(int resource_id));
MOCK_METHOD2(LoadDataResourceBytes,
- base::RefCountedStaticMemory*(int resource_id,
- ui::ScaleFactor scale_factor));
+ base::RefCountedMemory*(int resource_id, ui::ScaleFactor scale_factor));
MOCK_METHOD2(GetRawDataResourceMock, base::StringPiece(
int resource_id,
ui::ScaleFactor scale_factor));
@@ -266,7 +265,7 @@ TEST_F(ResourceBundleTest, DelegateLoadDataResourceBytes) {
EXPECT_CALL(delegate, LoadDataResourceBytes(resource_id, scale_factor))
.Times(1).WillOnce(Return(static_memory.get()));
- scoped_refptr<base::RefCountedStaticMemory> result =
+ scoped_refptr<base::RefCountedMemory> result =
resource_bundle->LoadDataResourceBytesForScale(resource_id, scale_factor);
EXPECT_EQ(static_memory, result);
}
« no previous file with comments | « ui/base/resource/resource_bundle_ios.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698