| Index: components/test/run_all_unittests.cc
|
| diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
|
| index b31397b34efb2ac5d733ca79463a6e9e8867ef52..26a15afcb84f6500bec220efbf39c6b049745f31 100644
|
| --- a/components/test/run_all_unittests.cc
|
| +++ b/components/test/run_all_unittests.cc
|
| @@ -37,7 +37,7 @@ class ComponentsTestSuite : public base::TestSuite {
|
| ComponentsTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
|
|
|
| private:
|
| - virtual void Initialize() OVERRIDE {
|
| + virtual void Initialize() override {
|
| base::TestSuite::Initialize();
|
|
|
| // Initialize the histograms subsystem, so that any histograms hit in tests
|
| @@ -100,7 +100,7 @@ class ComponentsTestSuite : public base::TestSuite {
|
| "chrome-extension");
|
| }
|
|
|
| - virtual void Shutdown() OVERRIDE {
|
| + virtual void Shutdown() override {
|
| ui::ResourceBundle::CleanupSharedInstance();
|
|
|
| #if defined(OS_MACOSX) && !defined(OS_IOS)
|
| @@ -118,11 +118,11 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
|
| ComponentsUnitTestEventListener() {}
|
| virtual ~ComponentsUnitTestEventListener() {}
|
|
|
| - virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
|
| + virtual void OnTestStart(const testing::TestInfo& test_info) override {
|
| content_initializer_.reset(new content::TestContentClientInitializer());
|
| }
|
|
|
| - virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
|
| + virtual void OnTestEnd(const testing::TestInfo& test_info) override {
|
| content_initializer_.reset();
|
| }
|
|
|
|
|