| Index: content/test/content_test_launcher.cc
|
| diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
|
| index 92234425ee3fed98aeec145307e44f0e9a108182..6990fe901a790ba521ba20bffc10b2a7c201f6a8 100644
|
| --- a/content/test/content_test_launcher.cc
|
| +++ b/content/test/content_test_launcher.cc
|
| @@ -49,7 +49,7 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
|
| }
|
|
|
| protected:
|
| - virtual void Initialize() OVERRIDE {
|
| + virtual void Initialize() override {
|
|
|
| #if defined(OS_ANDROID)
|
| base::i18n::AllowMultipleInitializeCallsForTesting();
|
| @@ -93,12 +93,12 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
|
| ContentTestLauncherDelegate() {}
|
| virtual ~ContentTestLauncherDelegate() {}
|
|
|
| - virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
|
| + virtual int RunTestSuite(int argc, char** argv) override {
|
| return ContentBrowserTestSuite(argc, argv).Run();
|
| }
|
|
|
| virtual bool AdjustChildProcessCommandLine(
|
| - CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
|
| + CommandLine* command_line, const base::FilePath& temp_data_dir) override {
|
| command_line->AppendSwitchPath(switches::kContentShellDataPath,
|
| temp_data_dir);
|
| command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
|
| @@ -107,7 +107,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
|
| }
|
|
|
| protected:
|
| - virtual ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
|
| + virtual ContentMainDelegate* CreateContentMainDelegate() override {
|
| return new ShellMainDelegate();
|
| }
|
|
|
|
|