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

This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.

BUG=417463
TBR=sky@chromium.org

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

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

17 files changed, 68 insertions, 75 deletions

diff --git a/content/browser/geolocation/geolocation_dispatcher_host.h b/content/browser/geolocation/geolocation_dispatcher_host.h
index c719e7a..d942cff 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.h
+++ b/content/browser/geolocation/geolocation_dispatcher_host.h
@@ -22,7 +22,7 @@ namespace content {
 class GeolocationDispatcherHost : public WebContentsObserver {
  public:
   explicit GeolocationDispatcherHost(WebContents* web_contents);
-  virtual ~GeolocationDispatcherHost();
+  ~GeolocationDispatcherHost() override;
 
   // Pause or resumes geolocation. Resuming when nothing is paused is a no-op.
   // If the web contents is paused while not currently using geolocation but
@@ -39,14 +39,14 @@ class GeolocationDispatcherHost : public WebContentsObserver {
 
  private:
   // WebContentsObserver
-  virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
-  virtual void RenderViewHostChanged(RenderViewHost* old_host,
-                                     RenderViewHost* new_host) override;
-  virtual void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
-                                   const LoadCommittedDetails& details,
-                                   const FrameNavigateParams& params) override;
-  virtual bool OnMessageReceived(
-      const IPC::Message& msg, RenderFrameHost* render_frame_host) override;
+  void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
+  void RenderViewHostChanged(RenderViewHost* old_host,
+                             RenderViewHost* new_host) override;
+  void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
+                           const LoadCommittedDetails& details,
+                           const FrameNavigateParams& params) override;
+  bool OnMessageReceived(const IPC::Message& msg,
+                         RenderFrameHost* render_frame_host) override;
 
   // Message handlers:
   // TODO(mlamouri): |requesting_origin| should be a security origin to
diff --git a/content/browser/geolocation/geolocation_provider_impl.h b/content/browser/geolocation/geolocation_provider_impl.h
index c4a29c5..b3c1286 100644
--- a/content/browser/geolocation/geolocation_provider_impl.h
+++ b/content/browser/geolocation/geolocation_provider_impl.h
@@ -26,11 +26,11 @@ class CONTENT_EXPORT GeolocationProviderImpl
       public base::Thread {
  public:
   // GeolocationProvider implementation:
-  virtual scoped_ptr<GeolocationProvider::Subscription>
-      AddLocationUpdateCallback(const LocationUpdateCallback& callback,
-                                bool use_high_accuracy) override;
-  virtual void UserDidOptIntoLocationServices() override;
-  virtual void OverrideLocationForTesting(const Geoposition& position) override;
+  scoped_ptr<GeolocationProvider::Subscription> AddLocationUpdateCallback(
+      const LocationUpdateCallback& callback,
+      bool use_high_accuracy) override;
+  void UserDidOptIntoLocationServices() override;
+  void OverrideLocationForTesting(const Geoposition& position) override;
 
   // Callback from the LocationArbitrator. Public for testing.
   void OnLocationUpdate(const Geoposition& position);
@@ -48,7 +48,7 @@ class CONTENT_EXPORT GeolocationProviderImpl
  protected:
   friend struct DefaultSingletonTraits<GeolocationProviderImpl>;
   GeolocationProviderImpl();
-  virtual ~GeolocationProviderImpl();
+  ~GeolocationProviderImpl() override;
 
   // Useful for injecting mock geolocation arbitrator in tests.
   virtual LocationArbitrator* CreateArbitrator();
@@ -75,8 +75,8 @@ class CONTENT_EXPORT GeolocationProviderImpl
   void NotifyClients(const Geoposition& position);
 
   // Thread
-  virtual void Init() override;
-  virtual void CleanUp() override;
+  void Init() override;
+  void CleanUp() override;
 
   base::CallbackList<void(const Geoposition&)> high_accuracy_callbacks_;
   base::CallbackList<void(const Geoposition&)> low_accuracy_callbacks_;
diff --git a/content/browser/geolocation/geolocation_provider_impl_unittest.cc b/content/browser/geolocation/geolocation_provider_impl_unittest.cc
index 1558daad..47275e1 100644
--- a/content/browser/geolocation/geolocation_provider_impl_unittest.cc
+++ b/content/browser/geolocation/geolocation_provider_impl_unittest.cc
@@ -27,7 +27,7 @@ namespace content {
 class LocationProviderForTestArbitrator : public GeolocationProviderImpl {
  public:
   LocationProviderForTestArbitrator() : mock_arbitrator_(NULL) {}
-  virtual ~LocationProviderForTestArbitrator() {}
+  ~LocationProviderForTestArbitrator() override {}
 
   // Only valid for use on the geolocation thread.
   MockLocationArbitrator* mock_arbitrator() const {
@@ -36,7 +36,7 @@ class LocationProviderForTestArbitrator : public GeolocationProviderImpl {
 
  protected:
   // GeolocationProviderImpl implementation:
-  virtual LocationArbitrator* CreateArbitrator() override;
+  LocationArbitrator* CreateArbitrator() override;
 
  private:
   MockLocationArbitrator* mock_arbitrator_;
@@ -61,7 +61,7 @@ class MockGeolocationObserver : public GeolocationObserver {
 
 class AsyncMockGeolocationObserver : public MockGeolocationObserver {
  public:
-  virtual void OnLocationUpdate(const Geoposition& position) override {
+  void OnLocationUpdate(const Geoposition& position) override {
     MockGeolocationObserver::OnLocationUpdate(position);
     base::MessageLoop::current()->Quit();
   }
diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h
index 45682ab..3ef7d5d 100644
--- a/content/browser/geolocation/location_arbitrator_impl.h
+++ b/content/browser/geolocation/location_arbitrator_impl.h
@@ -37,15 +37,15 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
   typedef base::Callback<void(const Geoposition&)> LocationUpdateCallback;
 
   explicit LocationArbitratorImpl(const LocationUpdateCallback& callback);
-  virtual ~LocationArbitratorImpl();
+  ~LocationArbitratorImpl() override;
 
   static GURL DefaultNetworkProviderURL();
 
   // LocationArbitrator
-  virtual void StartProviders(bool use_high_accuracy) override;
-  virtual void StopProviders() override;
-  virtual void OnPermissionGranted() override;
-  virtual bool HasPermissionBeenGranted() const override;
+  void StartProviders(bool use_high_accuracy) override;
+  void StopProviders() override;
+  void OnPermissionGranted() override;
+  bool HasPermissionBeenGranted() const override;
 
  protected:
   AccessTokenStore* GetAccessTokenStore();
diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
index ff6ed25..f5142fa 100644
--- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -73,15 +73,13 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
         access_token_store_(access_token_store) {
   }
 
-  virtual base::Time GetTimeNow() const override {
-    return GetTimeNowForTest();
-  }
+  base::Time GetTimeNow() const override { return GetTimeNowForTest(); }
 
-  virtual AccessTokenStore* NewAccessTokenStore() override {
+  AccessTokenStore* NewAccessTokenStore() override {
     return access_token_store_.get();
   }
 
-  virtual LocationProvider* NewNetworkLocationProvider(
+  LocationProvider* NewNetworkLocationProvider(
       AccessTokenStore* access_token_store,
       net::URLRequestContextGetter* context,
       const GURL& url,
@@ -89,7 +87,7 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
     return new MockLocationProvider(&cell_);
   }
 
-  virtual LocationProvider* NewSystemLocationProvider() override {
+  LocationProvider* NewSystemLocationProvider() override {
     return new MockLocationProvider(&gps_);
   }
 
diff --git a/content/browser/geolocation/location_provider_base.h b/content/browser/geolocation/location_provider_base.h
index 196dc5c..1e3f443 100644
--- a/content/browser/geolocation/location_provider_base.h
+++ b/content/browser/geolocation/location_provider_base.h
@@ -14,15 +14,15 @@ class CONTENT_EXPORT LocationProviderBase
     : NON_EXPORTED_BASE(public LocationProvider) {
  public:
   LocationProviderBase();
-  virtual ~LocationProviderBase();
+  ~LocationProviderBase() override;
 
  protected:
   void NotifyCallback(const Geoposition& position);
 
   // Overridden from LocationProvider:
-  virtual void SetUpdateCallback(
+  void SetUpdateCallback(
       const LocationProviderUpdateCallback& callback) override;
-  virtual void RequestRefresh() override;
+  void RequestRefresh() override;
 
  private:
   LocationProviderUpdateCallback callback_;
diff --git a/content/browser/geolocation/mock_location_arbitrator.h b/content/browser/geolocation/mock_location_arbitrator.h
index b65818b..620bcc8 100644
--- a/content/browser/geolocation/mock_location_arbitrator.h
+++ b/content/browser/geolocation/mock_location_arbitrator.h
@@ -20,11 +20,10 @@ class MockLocationArbitrator : public LocationArbitrator {
   bool providers_started() const { return providers_started_; }
 
   // LocationArbitrator:
-  virtual void StartProviders(bool use_high_accuracy)
-      override;
-  virtual void StopProviders() override;
-  virtual void OnPermissionGranted() override;
-  virtual bool HasPermissionBeenGranted() const override;
+  void StartProviders(bool use_high_accuracy) override;
+  void StopProviders() override;
+  void OnPermissionGranted() override;
+  bool HasPermissionBeenGranted() const override;
 
  private:
   bool permission_granted_;
diff --git a/content/browser/geolocation/mock_location_provider.cc b/content/browser/geolocation/mock_location_provider.cc
index 58d9c43..2953ba1 100644
--- a/content/browser/geolocation/mock_location_provider.cc
+++ b/content/browser/geolocation/mock_location_provider.cc
@@ -86,7 +86,7 @@ class AutoMockLocationProvider : public MockLocationProvider {
       position_.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
     }
   }
-  virtual bool StartProvider(bool high_accuracy) override {
+  bool StartProvider(bool high_accuracy) override {
     MockLocationProvider::StartProvider(high_accuracy);
     if (!requires_permission_to_start_) {
       UpdateListenersIfNeeded();
@@ -94,7 +94,7 @@ class AutoMockLocationProvider : public MockLocationProvider {
     return true;
   }
 
-  virtual void OnPermissionGranted() override {
+  void OnPermissionGranted() override {
     MockLocationProvider::OnPermissionGranted();
     if (requires_permission_to_start_) {
       UpdateListenersIfNeeded();
diff --git a/content/browser/geolocation/mock_location_provider.h b/content/browser/geolocation/mock_location_provider.h
index e0e2199..882a447 100644
--- a/content/browser/geolocation/mock_location_provider.h
+++ b/content/browser/geolocation/mock_location_provider.h
@@ -20,16 +20,16 @@ class MockLocationProvider : public LocationProviderBase {
   // Will update |*self_ref| to point to |this| on construction, and to NULL
   // on destruction.
   explicit MockLocationProvider(MockLocationProvider** self_ref);
-  virtual ~MockLocationProvider();
+  ~MockLocationProvider() override;
 
   // Updates listeners with the new position.
   void HandlePositionChanged(const Geoposition& position);
 
   // LocationProvider implementation.
-  virtual bool StartProvider(bool high_accuracy) override;
-  virtual void StopProvider() override;
-  virtual void GetPosition(Geoposition* position) override;
-  virtual void OnPermissionGranted() override;
+  bool StartProvider(bool high_accuracy) override;
+  void StopProvider() override;
+  void GetPosition(Geoposition* position) override;
+  void OnPermissionGranted() override;
 
   Geoposition position_;
   enum State { STOPPED, LOW_ACCURACY, HIGH_ACCURACY } state_;
diff --git a/content/browser/geolocation/network_location_provider.h b/content/browser/geolocation/network_location_provider.h
index 06e90da..e3588c6 100644
--- a/content/browser/geolocation/network_location_provider.h
+++ b/content/browser/geolocation/network_location_provider.h
@@ -69,14 +69,14 @@ class NetworkLocationProvider
                           net::URLRequestContextGetter* context,
                           const GURL& url,
                           const base::string16& access_token);
-  virtual ~NetworkLocationProvider();
+  ~NetworkLocationProvider() override;
 
   // LocationProvider implementation
-  virtual bool StartProvider(bool high_accuracy) override;
-  virtual void StopProvider() override;
-  virtual void GetPosition(Geoposition *position) override;
-  virtual void RequestRefresh() override;
-  virtual void OnPermissionGranted() override;
+  bool StartProvider(bool high_accuracy) override;
+  void StopProvider() override;
+  void GetPosition(Geoposition* position) override;
+  void RequestRefresh() override;
+  void OnPermissionGranted() override;
 
  private:
   // Satisfies a position request from cache or network.
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index ea52b90..881ec68 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -66,15 +66,11 @@ class MockWifiDataProvider : public WifiDataProvider {
   MockWifiDataProvider() : start_calls_(0), stop_calls_(0), got_data_(true) {}
 
   // WifiDataProvider implementation.
-  virtual void StartDataProvider() override {
-    ++start_calls_;
-  }
+  void StartDataProvider() override { ++start_calls_; }
 
-  virtual void StopDataProvider() override {
-    ++stop_calls_;
-  }
+  void StopDataProvider() override { ++stop_calls_; }
 
-  virtual bool GetData(WifiData* data_out) override {
+  bool GetData(WifiData* data_out) override {
     CHECK(data_out);
     *data_out = data_;
     return got_data_;
@@ -93,7 +89,7 @@ class MockWifiDataProvider : public WifiDataProvider {
   int stop_calls_;
 
  private:
-  virtual ~MockWifiDataProvider() {
+  ~MockWifiDataProvider() override {
     CHECK(this == instance_);
     instance_ = NULL;
   }
diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index ee1f9b1..f0734e0 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -41,7 +41,7 @@ class NetworkLocationRequest : private net::URLFetcherDelegate {
   NetworkLocationRequest(net::URLRequestContextGetter* context,
                          const GURL& url,
                          LocationResponseCallback callback);
-  virtual ~NetworkLocationRequest();
+  ~NetworkLocationRequest() override;
 
   // Makes a new request. Returns true if the new request was successfully
   // started. In all cases, any currently pending request will be canceled.
@@ -54,7 +54,7 @@ class NetworkLocationRequest : private net::URLFetcherDelegate {
 
  private:
   // net::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   LocationResponseCallback location_response_callback_;
diff --git a/content/browser/geolocation/wifi_data_provider_common.h b/content/browser/geolocation/wifi_data_provider_common.h
index 61939c5..771dd41 100644
--- a/content/browser/geolocation/wifi_data_provider_common.h
+++ b/content/browser/geolocation/wifi_data_provider_common.h
@@ -39,12 +39,12 @@ class CONTENT_EXPORT WifiDataProviderCommon : public WifiDataProvider {
   WifiDataProviderCommon();
 
   // WifiDataProvider implementation
-  virtual void StartDataProvider() override;
-  virtual void StopDataProvider() override;
-  virtual bool GetData(WifiData* data) override;
+  void StartDataProvider() override;
+  void StopDataProvider() override;
+  bool GetData(WifiData* data) override;
 
  protected:
-  virtual ~WifiDataProviderCommon();
+  ~WifiDataProviderCommon() override;
 
   // Returns ownership.
   virtual WlanApiInterface* NewWlanApi() = 0;
diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
index 54763a6..01a6ffb 100644
--- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -84,11 +84,11 @@ class WifiDataProviderCommonWithMock : public WifiDataProviderCommon {
         new_polling_policy_(new MockPollingPolicy) {}
 
   // WifiDataProviderCommon
-  virtual WlanApiInterface* NewWlanApi() override {
+  WlanApiInterface* NewWlanApi() override {
     CHECK(new_wlan_api_ != NULL);
     return new_wlan_api_.release();
   }
-  virtual WifiPollingPolicy* NewPollingPolicy() override {
+  WifiPollingPolicy* NewPollingPolicy() override {
     CHECK(new_polling_policy_ != NULL);
     return new_polling_policy_.release();
   }
@@ -97,7 +97,7 @@ class WifiDataProviderCommonWithMock : public WifiDataProviderCommon {
   scoped_ptr<MockPollingPolicy> new_polling_policy_;
 
  private:
-  virtual ~WifiDataProviderCommonWithMock() {}
+  ~WifiDataProviderCommonWithMock() override {}
 
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderCommonWithMock);
 };
diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
index ee5fbcf..7e783f4 100644
--- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
+++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
@@ -55,7 +55,7 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
   bool Init();
 
   // WlanApiInterface
-  virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) override;
+  bool GetAccessPointData(WifiData::AccessPointDataSet* data) override;
 
  private:
   base::scoped_nsobject<NSBundle> bundle_;
diff --git a/content/browser/geolocation/wifi_data_provider_mac.cc b/content/browser/geolocation/wifi_data_provider_mac.cc
index 39d65dd..da54187 100644
--- a/content/browser/geolocation/wifi_data_provider_mac.cc
+++ b/content/browser/geolocation/wifi_data_provider_mac.cc
@@ -30,7 +30,7 @@ const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
 class Apple80211Api : public WifiDataProviderCommon::WlanApiInterface {
  public:
   Apple80211Api();
-  virtual ~Apple80211Api();
+  ~Apple80211Api() override;
 
   // Must be called before any other interface method. Will return false if the
   // Apple80211 framework cannot be initialized (e.g. running on post-10.5 OSX),
@@ -38,7 +38,7 @@ class Apple80211Api : public WifiDataProviderCommon::WlanApiInterface {
   bool Init();
 
   // WlanApiInterface
-  virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) override;
+  bool GetAccessPointData(WifiData::AccessPointDataSet* data) override;
 
  private:
   // Handle, context and function pointers for Apple80211 library.
diff --git a/content/browser/geolocation/wifi_data_provider_mac.h b/content/browser/geolocation/wifi_data_provider_mac.h
index 4116a89..c1bd798 100644
--- a/content/browser/geolocation/wifi_data_provider_mac.h
+++ b/content/browser/geolocation/wifi_data_provider_mac.h
@@ -17,11 +17,11 @@ class WifiDataProviderMac : public WifiDataProviderCommon {
   WifiDataProviderMac();
 
  private:
-  virtual ~WifiDataProviderMac();
+  ~WifiDataProviderMac() override;
 
   // WifiDataProviderCommon
-  virtual WlanApiInterface* NewWlanApi() override;
-  virtual WifiPollingPolicy* NewPollingPolicy() override;
+  WlanApiInterface* NewWlanApi() override;
+  WifiPollingPolicy* NewPollingPolicy() override;
 
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderMac);
 };