Standardize usage of virtual/override/final in chrome/browser/

BUG=417463
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/648653003

Cr-Commit-Position: refs/heads/master@{#300440}

14 files changed, 78 insertions, 88 deletions

diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 79dc43f..395ac20 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -111,9 +111,7 @@ class FakeBackgroundModeManager : public BackgroundModeManager {
     background_mode_active_ = active;
   }
 
-  virtual bool IsBackgroundModeActive() override {
-    return background_mode_active_;
-  }
+  bool IsBackgroundModeActive() override { return background_mode_active_; }
 
  private:
   bool background_mode_active_;
@@ -161,7 +159,7 @@ class BetterSessionRestoreTest : public InProcessBrowserTest {
   }
 
  protected:
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     SessionServiceTestHelper helper(
         SessionServiceFactory::GetForProfile(browser()->profile()));
     helper.SetForceBrowserNotAliveWithNoWindows(true);
@@ -371,15 +369,15 @@ class ContinueWhereILeftOffTest : public BetterSessionRestoreTest {
  public:
   ContinueWhereILeftOffTest() { }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     BetterSessionRestoreTest::SetUpOnMainThread();
     SessionStartupPref::SetStartupPref(
         browser()->profile(), SessionStartupPref(SessionStartupPref::LAST));
   }
 
  protected:
-  virtual Browser* QuitBrowserAndRestore(Browser* browser,
-                                         bool close_all_windows) override {
+  Browser* QuitBrowserAndRestore(Browser* browser,
+                                 bool close_all_windows) override {
     content::WindowedNotificationObserver session_restore_observer(
         chrome::NOTIFICATION_SESSION_RESTORE_DONE,
         content::NotificationService::AllSources());
@@ -669,7 +667,7 @@ class NoSessionRestoreTest : public BetterSessionRestoreTest {
  public:
   NoSessionRestoreTest() { }
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     BetterSessionRestoreTest::SetUpOnMainThread();
     SessionStartupPref::SetStartupPref(
         browser()->profile(), SessionStartupPref(SessionStartupPref::DEFAULT));
diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc
index a10b247..766a3f0 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service.cc
+++ b/chrome/browser/sessions/persistent_tab_restore_service.cc
@@ -119,17 +119,16 @@ class PersistentTabRestoreService::Delegate
  public:
   explicit Delegate(Profile* profile);
 
-  virtual ~Delegate();
+  ~Delegate() override;
 
   // BaseSessionService:
-  virtual void Save() override;
+  void Save() override;
 
   // TabRestoreServiceHelper::Observer:
-  virtual void OnClearEntries() override;
-  virtual void OnRestoreEntryById(
-      SessionID::id_type id,
-      Entries::const_iterator entry_iterator) override;
-  virtual void OnAddEntry() override;
+  void OnClearEntries() override;
+  void OnRestoreEntryById(SessionID::id_type id,
+                          Entries::const_iterator entry_iterator) override;
+  void OnAddEntry() override;
 
   void set_tab_restore_service_helper(
       TabRestoreServiceHelper* tab_restore_service_helper) {
diff --git a/chrome/browser/sessions/persistent_tab_restore_service.h b/chrome/browser/sessions/persistent_tab_restore_service.h
index 3d59ab7..643030d 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service.h
+++ b/chrome/browser/sessions/persistent_tab_restore_service.h
@@ -22,30 +22,29 @@ class PersistentTabRestoreService : public TabRestoreService {
   PersistentTabRestoreService(Profile* profile,
                               TimeFactory* time_factory);
 
-  virtual ~PersistentTabRestoreService();
+  ~PersistentTabRestoreService() override;
 
   // TabRestoreService:
-  virtual void AddObserver(TabRestoreServiceObserver* observer) override;
-  virtual void RemoveObserver(TabRestoreServiceObserver* observer) override;
-  virtual void CreateHistoricalTab(content::WebContents* contents,
-                                   int index) override;
-  virtual void BrowserClosing(TabRestoreServiceDelegate* delegate) override;
-  virtual void BrowserClosed(TabRestoreServiceDelegate* delegate) override;
-  virtual void ClearEntries() override;
-  virtual const Entries& entries() const override;
-  virtual std::vector<content::WebContents*> RestoreMostRecentEntry(
+  void AddObserver(TabRestoreServiceObserver* observer) override;
+  void RemoveObserver(TabRestoreServiceObserver* observer) override;
+  void CreateHistoricalTab(content::WebContents* contents, int index) override;
+  void BrowserClosing(TabRestoreServiceDelegate* delegate) override;
+  void BrowserClosed(TabRestoreServiceDelegate* delegate) override;
+  void ClearEntries() override;
+  const Entries& entries() const override;
+  std::vector<content::WebContents*> RestoreMostRecentEntry(
       TabRestoreServiceDelegate* delegate,
       chrome::HostDesktopType host_desktop_type) override;
-  virtual Tab* RemoveTabEntryById(SessionID::id_type id) override;
-  virtual std::vector<content::WebContents*> RestoreEntryById(
+  Tab* RemoveTabEntryById(SessionID::id_type id) override;
+  std::vector<content::WebContents*> RestoreEntryById(
       TabRestoreServiceDelegate* delegate,
       SessionID::id_type id,
       chrome::HostDesktopType host_desktop_type,
       WindowOpenDisposition disposition) override;
-  virtual void LoadTabsFromLastSession() override;
-  virtual bool IsLoaded() const override;
-  virtual void DeleteLastSession() override;
-  virtual void Shutdown() override;
+  void LoadTabsFromLastSession() override;
+  bool IsLoaded() const override;
+  void DeleteLastSession() override;
+  void Shutdown() override;
 
  private:
   friend class PersistentTabRestoreServiceTest;
diff --git a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
index a3d538b..8a52e61 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
+++ b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
@@ -46,11 +46,9 @@ class PersistentTabRestoreTimeFactory : public TabRestoreService::TimeFactory {
  public:
   PersistentTabRestoreTimeFactory() : time_(base::Time::Now()) {}
 
-  virtual ~PersistentTabRestoreTimeFactory() {}
+  ~PersistentTabRestoreTimeFactory() override {}
 
-  virtual base::Time TimeNow() override {
-    return time_;
-  }
+  base::Time TimeNow() override { return time_; }
 
  private:
   base::Time time_;
@@ -181,11 +179,9 @@ class TestTabRestoreServiceObserver : public TabRestoreServiceObserver {
   bool got_loaded() const { return got_loaded_; }
 
   // TabRestoreServiceObserver:
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) override {
-  }
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override {
-  }
-  virtual void TabRestoreServiceLoaded(TabRestoreService* service) override {
+  void TabRestoreServiceChanged(TabRestoreService* service) override {}
+  void TabRestoreServiceDestroyed(TabRestoreService* service) override {}
+  void TabRestoreServiceLoaded(TabRestoreService* service) override {
     got_loaded_ = true;
   }
 
diff --git a/chrome/browser/sessions/restore_on_startup_policy_handler.h b/chrome/browser/sessions/restore_on_startup_policy_handler.h
index 4a907c1..3fea806 100644
--- a/chrome/browser/sessions/restore_on_startup_policy_handler.h
+++ b/chrome/browser/sessions/restore_on_startup_policy_handler.h
@@ -18,13 +18,13 @@ class PolicyMap;
 class RestoreOnStartupPolicyHandler : public TypeCheckingPolicyHandler {
  public:
   RestoreOnStartupPolicyHandler();
-  virtual ~RestoreOnStartupPolicyHandler();
+  ~RestoreOnStartupPolicyHandler() override;
 
   // ConfigurationPolicyHandler methods:
-  virtual bool CheckPolicySettings(const PolicyMap& policies,
-                                   PolicyErrorMap* errors) override;
-  virtual void ApplyPolicySettings(const PolicyMap& policies,
-                                   PrefValueMap* prefs) override;
+  bool CheckPolicySettings(const PolicyMap& policies,
+                           PolicyErrorMap* errors) override;
+  void ApplyPolicySettings(const PolicyMap& policies,
+                           PrefValueMap* prefs) override;
 
  private:
   void ApplyPolicySettingsFromHomePage(const PolicyMap& policies,
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index bcace9b..f7f5a1e 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -118,7 +118,7 @@ class TabLoader : public content::NotificationObserver,
   typedef std::set<RenderWidgetHost*> RenderWidgetHostSet;
 
   explicit TabLoader(base::TimeTicks restore_started);
-  virtual ~TabLoader();
+  ~TabLoader() override;
 
   // Loads the next tab. If there are no more tabs to load this deletes itself,
   // otherwise |force_load_timer_| is restarted.
@@ -126,12 +126,12 @@ class TabLoader : public content::NotificationObserver,
 
   // NotificationObserver method. Removes the specified tab and loads the next
   // tab.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
-  virtual void OnConnectionTypeChanged(
+  void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) override;
 
   // Removes the listeners from the specified tab and removes the tab from
@@ -686,7 +686,7 @@ class SessionRestoreImpl : public content::NotificationObserver {
     return web_contents;
   }
 
-  virtual ~SessionRestoreImpl() {
+  ~SessionRestoreImpl() override {
     STLDeleteElements(&windows_);
 
     active_session_restorers->erase(this);
@@ -698,9 +698,9 @@ class SessionRestoreImpl : public content::NotificationObserver {
     g_browser_process->ReleaseModule();
   }
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override {
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override {
     switch (type) {
       case chrome::NOTIFICATION_BROWSER_CLOSED:
         delete this;
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 38155b3..1dedb15 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -72,7 +72,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
   }
 #endif
 
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     active_browser_list_ = BrowserList::GetInstance(chrome::GetActiveDesktop());
 
     SessionStartupPref pref(SessionStartupPref::LAST);
@@ -93,7 +93,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
-  virtual bool SetUpUserDataDirectory() override {
+  bool SetUpUserDataDirectory() override {
     url1_ = ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("session_history"),
         base::FilePath().AppendASCII("bot1.html"));
diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h
index 0b0a8b5..d2500fa 100644
--- a/chrome/browser/sessions/session_service.h
+++ b/chrome/browser/sessions/session_service.h
@@ -72,7 +72,7 @@ class SessionService : public BaseSessionService,
   // For testing.
   explicit SessionService(const base::FilePath& save_path);
 
-  virtual ~SessionService();
+  ~SessionService() override;
 
   // Returns true if a new window opening should really be treated like the
   // start of a session (with potential session restore, startup URLs, etc.).
@@ -200,7 +200,7 @@ class SessionService : public BaseSessionService,
 
   // Overridden from BaseSessionService because we want some UMA reporting on
   // session update activities.
-  virtual void Save() override;
+  void Save() override;
 
  private:
   // Allow tests to access our innards for testing purposes.
@@ -233,14 +233,14 @@ class SessionService : public BaseSessionService,
   bool RestoreIfNecessary(const std::vector<GURL>& urls_to_open,
                           Browser* browser);
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override;
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override;
 
   // chrome::BrowserListObserver
-  virtual void OnBrowserAdded(Browser* browser) override {}
-  virtual void OnBrowserRemoved(Browser* browser) override {}
-  virtual void OnBrowserSetLastActive(Browser* browser) override;
+  void OnBrowserAdded(Browser* browser) override {}
+  void OnBrowserRemoved(Browser* browser) override {}
+  void OnBrowserSetLastActive(Browser* browser) override;
 
   // Sets the application extension id of the specified tab.
   void SetTabExtensionAppID(const SessionID& window_id,
@@ -389,7 +389,7 @@ class SessionService : public BaseSessionService,
 
   // Schedules the specified command. This method takes ownership of the
   // command.
-  virtual void ScheduleCommand(SessionCommand* command) override;
+  void ScheduleCommand(SessionCommand* command) override;
 
   // Converts all pending tab/window closes to commands and schedules them.
   void CommitPendingCloses();
diff --git a/chrome/browser/sessions/session_service_factory.h b/chrome/browser/sessions/session_service_factory.h
index 625e905..2c73d57 100644
--- a/chrome/browser/sessions/session_service_factory.h
+++ b/chrome/browser/sessions/session_service_factory.h
@@ -59,13 +59,13 @@ class SessionServiceFactory : public BrowserContextKeyedServiceFactory {
                            DetachingTabWithCrashedInfoBar);
 
   SessionServiceFactory();
-  virtual ~SessionServiceFactory();
+  ~SessionServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
-  virtual bool ServiceIsCreatedWithBrowserContext() const override;
-  virtual bool ServiceIsNULLWhileTesting() const override;
+  bool ServiceIsCreatedWithBrowserContext() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_FACTORY_H_
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 9e11086..21a99f4 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -69,9 +69,9 @@ class SessionServiceTest : public BrowserWithTestWindowTest,
   }
 
   // Upon notification, increment the sync_save_count variable
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) override {
+  void Observe(int type,
+               const content::NotificationSource& source,
+               const content::NotificationDetails& details) override {
     ASSERT_EQ(type, chrome::NOTIFICATION_SESSION_SERVICE_SAVED);
     sync_save_count_++;
   }
diff --git a/chrome/browser/sessions/session_tab_helper.h b/chrome/browser/sessions/session_tab_helper.h
index b6c5758..c83114a 100644
--- a/chrome/browser/sessions/session_tab_helper.h
+++ b/chrome/browser/sessions/session_tab_helper.h
@@ -15,7 +15,7 @@
 class SessionTabHelper : public content::WebContentsObserver,
                          public content::WebContentsUserData<SessionTabHelper> {
  public:
-  virtual ~SessionTabHelper();
+  ~SessionTabHelper() override;
 
   // Returns the identifier used by session restore for this tab.
   const SessionID& session_id() const { return session_id_; }
@@ -44,10 +44,9 @@ class SessionTabHelper : public content::WebContentsObserver,
 
   // content::WebContentsObserver:
 #if defined(ENABLE_EXTENSIONS)
-  virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) override;
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
 #endif
-  virtual void UserAgentOverrideSet(const std::string& user_agent) override;
+  void UserAgentOverrideSet(const std::string& user_agent) override;
 
  private:
   explicit SessionTabHelper(content::WebContents* contents);
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index 8df9a6f..2f5bd98 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -48,7 +48,7 @@ class WaitForLoadObserver : public TabRestoreServiceObserver {
       tab_restore_service_->AddObserver(this);
   }
 
-  virtual ~WaitForLoadObserver() {
+  ~WaitForLoadObserver() override {
     if (do_wait_)
       tab_restore_service_->RemoveObserver(this);
   }
@@ -60,10 +60,9 @@ class WaitForLoadObserver : public TabRestoreServiceObserver {
 
  private:
   // Overridden from TabRestoreServiceObserver:
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) override {}
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override {
-  }
-  virtual void TabRestoreServiceLoaded(TabRestoreService* service) override {
+  void TabRestoreServiceChanged(TabRestoreService* service) override {}
+  void TabRestoreServiceDestroyed(TabRestoreService* service) override {}
+  void TabRestoreServiceLoaded(TabRestoreService* service) override {
     DCHECK(do_wait_);
     run_loop_.Quit();
   }
@@ -87,7 +86,7 @@ class TabRestoreTest : public InProcessBrowserTest {
   }
 
  protected:
-  virtual void SetUpOnMainThread() override {
+  void SetUpOnMainThread() override {
     active_browser_list_ = BrowserList::GetInstance(chrome::GetActiveDesktop());
     InProcessBrowserTest::SetUpOnMainThread();
   }
diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h
index 12f3b5b..85566c7 100644
--- a/chrome/browser/sessions/tab_restore_service.h
+++ b/chrome/browser/sessions/tab_restore_service.h
@@ -77,7 +77,7 @@ class TabRestoreService : public KeyedService {
   // Represents a previously open tab.
   struct Tab : public Entry {
     Tab();
-    virtual ~Tab();
+    ~Tab() override;
 
     bool has_browser() const { return browser_id > 0; }
 
@@ -110,7 +110,7 @@ class TabRestoreService : public KeyedService {
   // Represents a previously open window.
   struct Window : public Entry {
     Window();
-    virtual ~Window();
+    ~Window() override;
 
     // The tabs that comprised the window, in order.
     std::vector<Tab> tabs;
@@ -124,7 +124,7 @@ class TabRestoreService : public KeyedService {
 
   typedef std::list<Entry*> Entries;
 
-  virtual ~TabRestoreService();
+  ~TabRestoreService() override;
 
   // Adds/removes an observer. TabRestoreService does not take ownership of
   // the observer.
diff --git a/chrome/browser/sessions/tab_restore_service_factory.h b/chrome/browser/sessions/tab_restore_service_factory.h
index d07eae3..d5183e24 100644
--- a/chrome/browser/sessions/tab_restore_service_factory.h
+++ b/chrome/browser/sessions/tab_restore_service_factory.h
@@ -30,12 +30,12 @@ class TabRestoreServiceFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<TabRestoreServiceFactory>;
 
   TabRestoreServiceFactory();
-  virtual ~TabRestoreServiceFactory();
+  ~TabRestoreServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
-  virtual bool ServiceIsNULLWhileTesting() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_FACTORY_H_