| Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
|
| index 8b137b151f3071616718f43c3b63ff7324aa5fee..bb213856d171b021c0727cde2c64768fc29bdb3b 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
|
| @@ -89,11 +89,11 @@ Browser* FindOneOtherBrowser(Browser* browser) {
|
|
|
| class StartupBrowserCreatorTest : public ExtensionBrowserTest {
|
| protected:
|
| - virtual bool SetUpUserDataDirectory() override {
|
| + bool SetUpUserDataDirectory() override {
|
| return ExtensionBrowserTest::SetUpUserDataDirectory();
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionBrowserTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kEnablePanels);
|
| command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL);
|
| @@ -142,11 +142,9 @@ class OpenURLsPopupObserver : public chrome::BrowserListObserver {
|
| public:
|
| OpenURLsPopupObserver() : added_browser_(NULL) { }
|
|
|
| - virtual void OnBrowserAdded(Browser* browser) override {
|
| - added_browser_ = browser;
|
| - }
|
| + void OnBrowserAdded(Browser* browser) override { added_browser_ = browser; }
|
|
|
| - virtual void OnBrowserRemoved(Browser* browser) override { }
|
| + void OnBrowserRemoved(Browser* browser) override {}
|
|
|
| Browser* added_browser_;
|
| };
|
| @@ -1003,7 +1001,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
|
|
|
| class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest {
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| InProcessBrowserTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
|
| }
|
| @@ -1045,8 +1043,8 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest,
|
|
|
| class StartupBrowserCreatorFirstRunTest : public InProcessBrowserTest {
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override;
|
| - virtual void SetUpInProcessBrowserTestFixture() override;
|
| + void SetUpCommandLine(CommandLine* command_line) override;
|
| + void SetUpInProcessBrowserTestFixture() override;
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| policy::MockConfigurationPolicyProvider provider_;
|
|
|