Enable strict-virtual-specifiers for iOS builds.

This CL cleans up the remaining errors and enables the compile
time check in common.gypi.

BUG=417463

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

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

7 files changed, 49 insertions, 52 deletions

diff --git a/ios/chrome/browser/suggestions/suggestions_service_factory.h b/ios/chrome/browser/suggestions/suggestions_service_factory.h
index 6f63199..3f86fc3 100644
--- a/ios/chrome/browser/suggestions/suggestions_service_factory.h
+++ b/ios/chrome/browser/suggestions/suggestions_service_factory.h
@@ -33,7 +33,7 @@ class SuggestionsServiceFactory : public BrowserStateKeyedServiceFactory {
   friend struct DefaultSingletonTraits<SuggestionsServiceFactory>;
 
   SuggestionsServiceFactory();
-  ~SuggestionsServiceFactory();
+  ~SuggestionsServiceFactory() override;
 
   // BrowserStateKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
diff --git a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
index 0fdd493..9eca432 100644
--- a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
+++ b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
@@ -19,20 +19,20 @@ class FakeProfileOAuth2TokenServiceIOSProvider
     : public ProfileOAuth2TokenServiceIOSProvider {
  public:
   FakeProfileOAuth2TokenServiceIOSProvider();
-  virtual ~FakeProfileOAuth2TokenServiceIOSProvider();
+  ~FakeProfileOAuth2TokenServiceIOSProvider() override;
 
   // ProfileOAuth2TokenServiceIOSProvider
-  virtual void InitializeSharedAuthentication() override;
+  void InitializeSharedAuthentication() override;
 
-  virtual void GetAccessToken(const std::string& account_id,
-                              const std::string& client_id,
-                              const std::string& client_secret,
-                              const std::set<std::string>& scopes,
-                              const AccessTokenCallback& callback) override;
+  void GetAccessToken(const std::string& account_id,
+                      const std::string& client_id,
+                      const std::string& client_secret,
+                      const std::set<std::string>& scopes,
+                      const AccessTokenCallback& callback) override;
 
-  virtual std::vector<std::string> GetAllAccountIds() override;
+  std::vector<std::string> GetAllAccountIds() override;
 
-  virtual AuthenticationErrorCategory GetAuthenticationErrorCategory(
+  AuthenticationErrorCategory GetAuthenticationErrorCategory(
       NSError* error) const override;
 
   // Methods to configure this fake provider.
diff --git a/ios/public/test/test_chrome_browser_provider.h b/ios/public/test/test_chrome_browser_provider.h
index c5a83be..698fa65 100644
--- a/ios/public/test/test_chrome_browser_provider.h
+++ b/ios/public/test/test_chrome_browser_provider.h
@@ -16,7 +16,7 @@ class FakeStringProvider;
 class TestChromeBrowserProvider : public ChromeBrowserProvider {
  public:
   TestChromeBrowserProvider();
-  virtual ~TestChromeBrowserProvider();
+  ~TestChromeBrowserProvider() override;
 
   // Returns the current provider as a |TestChromeBrowserProvider|.
   static TestChromeBrowserProvider* GetTestProvider();
diff --git a/ios/web/navigation/navigation_item_impl.h b/ios/web/navigation/navigation_item_impl.h
index 1e4707f..26cc2bc 100644
--- a/ios/web/navigation/navigation_item_impl.h
+++ b/ios/web/navigation/navigation_item_impl.h
@@ -21,30 +21,30 @@ class NavigationItemImpl : public web::NavigationItem {
  public:
   // Creates a default NavigationItemImpl.
   NavigationItemImpl();
-  virtual ~NavigationItemImpl();
+  ~NavigationItemImpl() override;
 
   // NavigationItem implementation:
-  virtual int GetUniqueID() const override;
-  virtual void SetURL(const GURL& url) override;
-  virtual const GURL& GetURL() const override;
-  virtual void SetReferrer(const web::Referrer& referrer) override;
-  virtual const web::Referrer& GetReferrer() const override;
-  virtual void SetVirtualURL(const GURL& url) override;
-  virtual const GURL& GetVirtualURL() const override;
-  virtual void SetTitle(const base::string16& title) override;
-  virtual const base::string16& GetTitle() const override;
-  virtual void SetPageID(int page_id) override;
-  virtual int32 GetPageID() const override;
-  virtual const base::string16& GetTitleForDisplay(
+  int GetUniqueID() const override;
+  void SetURL(const GURL& url) override;
+  const GURL& GetURL() const override;
+  void SetReferrer(const web::Referrer& referrer) override;
+  const web::Referrer& GetReferrer() const override;
+  void SetVirtualURL(const GURL& url) override;
+  const GURL& GetVirtualURL() const override;
+  void SetTitle(const base::string16& title) override;
+  const base::string16& GetTitle() const override;
+  void SetPageID(int page_id) override;
+  int32 GetPageID() const override;
+  const base::string16& GetTitleForDisplay(
       const std::string& languages) const override;
-  virtual void SetTransitionType(ui::PageTransition transition_type) override;
-  virtual ui::PageTransition GetTransitionType() const override;
-  virtual const FaviconStatus& GetFavicon() const override;
-  virtual FaviconStatus& GetFavicon() override;
-  virtual const SSLStatus& GetSSL() const override;
-  virtual SSLStatus& GetSSL() override;
-  virtual void SetTimestamp(base::Time timestamp) override;
-  virtual base::Time GetTimestamp() const override;
+  void SetTransitionType(ui::PageTransition transition_type) override;
+  ui::PageTransition GetTransitionType() const override;
+  const FaviconStatus& GetFavicon() const override;
+  FaviconStatus& GetFavicon() override;
+  const SSLStatus& GetSSL() const override;
+  SSLStatus& GetSSL() override;
+  void SetTimestamp(base::Time timestamp) override;
+  base::Time GetTimestamp() const override;
 
  private:
   int unique_id_;
diff --git a/ios/web/navigation/navigation_item_impl_unittest.mm b/ios/web/navigation/navigation_item_impl_unittest.mm
index 4c64221..a326b5c 100644
--- a/ios/web/navigation/navigation_item_impl_unittest.mm
+++ b/ios/web/navigation/navigation_item_impl_unittest.mm
@@ -15,9 +15,7 @@ namespace {
 
 class NavigationItemTest : public PlatformTest {
  protected:
-  virtual void SetUp() {
-    item_.reset(new NavigationItemImpl());
-  }
+  void SetUp() override { item_.reset(new NavigationItemImpl()); }
 
   scoped_ptr<NavigationItemImpl> item_;
 };
diff --git a/ios/web/public/test/test_web_state.h b/ios/web/public/test/test_web_state.h
index 7a7f4d5..ac89a7f 100644
--- a/ios/web/public/test/test_web_state.h
+++ b/ios/web/public/test/test_web_state.h
@@ -16,22 +16,21 @@ namespace web {
 class TestWebState : public WebState {
  public:
   // WebState implementation.
-  virtual BrowserState* GetBrowserState() const override;
-  virtual void OpenURL(const OpenURLParams& params) override {}
-  virtual NavigationManager* GetNavigationManager() override;
-  virtual CRWJSInjectionReceiver* GetJSInjectionReceiver() const override;
-  virtual const std::string& GetContentsMimeType() const override;
-  virtual const std::string& GetContentLanguageHeader() const override;
-  virtual bool ContentIsHTML() const override;
-  virtual const GURL& GetVisibleURL() const override;
-  virtual const GURL& GetLastCommittedURL() const override;
-  virtual void AddScriptCommandCallback(
-      const ScriptCommandCallback& callback,
-      const std::string& command_prefix) override {}
-  virtual void RemoveScriptCommandCallback(
-      const std::string& command_prefix) override {}
-  virtual void AddObserver(WebStateObserver* observer) override {}
-  virtual void RemoveObserver(WebStateObserver* observer) override {}
+  BrowserState* GetBrowserState() const override;
+  void OpenURL(const OpenURLParams& params) override {}
+  NavigationManager* GetNavigationManager() override;
+  CRWJSInjectionReceiver* GetJSInjectionReceiver() const override;
+  const std::string& GetContentsMimeType() const override;
+  const std::string& GetContentLanguageHeader() const override;
+  bool ContentIsHTML() const override;
+  const GURL& GetVisibleURL() const override;
+  const GURL& GetLastCommittedURL() const override;
+  void AddScriptCommandCallback(const ScriptCommandCallback& callback,
+                                const std::string& command_prefix) override {}
+  void RemoveScriptCommandCallback(const std::string& command_prefix) override {
+  }
+  void AddObserver(WebStateObserver* observer) override {}
+  void RemoveObserver(WebStateObserver* observer) override {}
 
  private:
   GURL url_;
diff --git a/ios/web/public/web_state/web_state.h b/ios/web/public/web_state/web_state.h
index 766a3bb..9c0418b 100644
--- a/ios/web/public/web_state/web_state.h
+++ b/ios/web/public/web_state/web_state.h
@@ -59,7 +59,7 @@ class WebState : public base::SupportsUserData {
     bool is_renderer_initiated;
   };
 
-  virtual ~WebState() {}
+  ~WebState() override {}
 
   // Gets the BrowserState associated with this WebState. Can never return null.
   virtual BrowserState* GetBrowserState() const = 0;