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 5aa5017c9662b8ab18726f91f36bbe7719a9cb3f..4362b7ed48a24392f91be318762a68374a816d57 100644 |
--- a/ui/base/resource/resource_bundle_unittest.cc |
+++ b/ui/base/resource/resource_bundle_unittest.cc |
@@ -59,7 +59,7 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { |
public: |
MockResourceBundleDelegate() { |
} |
- virtual ~MockResourceBundleDelegate() { |
+ ~MockResourceBundleDelegate() override { |
} |
MOCK_METHOD2(GetPathForResourcePack, base::FilePath( |
@@ -76,22 +76,21 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate { |
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 { |
+ bool GetRawDataResource(int resource_id, |
+ ui::ScaleFactor scale_factor, |
+ base::StringPiece* value) override { |
*value = GetRawDataResourceMock(resource_id, scale_factor); |
return true; |
} |
MOCK_METHOD1(GetLocalizedStringMock, base::string16(int message_id)); |
- virtual bool GetLocalizedString(int message_id, |
- base::string16* value) override { |
+ 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 { |
+ scoped_ptr<gfx::Font> GetFont(ui::ResourceBundle::FontStyle style) override { |
return make_scoped_ptr(GetFontMock(style)); |
} |
}; |