replace OVERRIDE and FINAL with override and final in components/

BUG=417463

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

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

15 files changed, 64 insertions, 64 deletions

diff --git a/components/component_updater/background_downloader_win.h b/components/component_updater/background_downloader_win.h
index 66cabe1..fe4a919 100644
--- a/components/component_updater/background_downloader_win.h
+++ b/components/component_updater/background_downloader_win.h
@@ -42,7 +42,7 @@ class BackgroundDownloader : public CrxDownloader {
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) OVERRIDE;
+  virtual void DoStartDownload(const GURL& url) override;
 
   // Called asynchronously on the |task_runner_| at different stages during
   // the download. |OnDownloading| can be called multiple times.
diff --git a/components/component_updater/component_patcher_operation.h b/components/component_updater/component_patcher_operation.h
index 4867ed7..02ca26d 100644
--- a/components/component_updater/component_patcher_operation.h
+++ b/components/component_updater/component_patcher_operation.h
@@ -92,9 +92,9 @@ class DeltaUpdateOpCopy : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath input_abs_path_;
 
@@ -116,9 +116,9 @@ class DeltaUpdateOpCreate : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   base::FilePath patch_abs_path_;
 
@@ -159,9 +159,9 @@ class DeltaUpdateOpPatch : public DeltaUpdateOp {
   virtual ComponentUnpacker::Error DoParseArguments(
       const base::DictionaryValue* command_args,
       const base::FilePath& input_dir,
-      ComponentInstaller* installer) OVERRIDE;
+      ComponentInstaller* installer) override;
 
-  virtual void DoRun(const ComponentUnpacker::Callback& callback) OVERRIDE;
+  virtual void DoRun(const ComponentUnpacker::Callback& callback) override;
 
   // |success_code| is the code that indicates a successful patch.
   // |result| is the code the patching operation returned.
diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
index 519b0f6..4cd4a7a 100644
--- a/components/component_updater/component_updater_service.cc
+++ b/components/component_updater/component_updater_service.cc
@@ -106,17 +106,17 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
   virtual ~CrxUpdateService();
 
   // Overrides for ComponentUpdateService.
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
-  virtual Status Start() OVERRIDE;
-  virtual Status Stop() OVERRIDE;
-  virtual Status RegisterComponent(const CrxComponent& component) OVERRIDE;
-  virtual std::vector<std::string> GetComponentIDs() const OVERRIDE;
-  virtual OnDemandUpdater& GetOnDemandUpdater() OVERRIDE;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
+  virtual Status Start() override;
+  virtual Status Stop() override;
+  virtual Status RegisterComponent(const CrxComponent& component) override;
+  virtual std::vector<std::string> GetComponentIDs() const override;
+  virtual OnDemandUpdater& GetOnDemandUpdater() override;
   virtual void MaybeThrottle(const std::string& crx_id,
-                             const base::Closure& callback) OVERRIDE;
+                             const base::Closure& callback) override;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
-      OVERRIDE;
+      override;
 
   // Context for a crx download url request.
   struct CRXContext {
@@ -143,10 +143,10 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
 
   // Overrides for ComponentUpdateService.
   virtual bool GetComponentDetails(const std::string& component_id,
-                                   CrxUpdateItem* item) const OVERRIDE;
+                                   CrxUpdateItem* item) const override;
 
   // Overrides for OnDemandUpdater.
-  virtual Status OnDemandUpdate(const std::string& component_id) OVERRIDE;
+  virtual Status OnDemandUpdate(const std::string& component_id) override;
 
   void UpdateCheckComplete(const GURL& original_url,
                            int error,
diff --git a/components/component_updater/default_component_installer.h b/components/component_updater/default_component_installer.h
index 6eaaecd..345c3dd 100644
--- a/components/component_updater/default_component_installer.h
+++ b/components/component_updater/default_component_installer.h
@@ -91,11 +91,11 @@ class DefaultComponentInstaller : public ComponentInstaller {
   void Register(ComponentUpdateService* cus);
 
   // Overridden from ComponentInstaller:
-  virtual void OnUpdateError(int error) OVERRIDE;
+  virtual void OnUpdateError(int error) override;
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
   virtual ~DefaultComponentInstaller();
 
diff --git a/components/component_updater/request_sender.h b/components/component_updater/request_sender.h
index 77d9964..2abcf47 100644
--- a/components/component_updater/request_sender.h
+++ b/components/component_updater/request_sender.h
@@ -44,7 +44,7 @@ class RequestSender : public net::URLFetcherDelegate {
   void SendInternal();
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   const Configurator& config_;
   std::vector<GURL> urls_;
diff --git a/components/component_updater/test/component_updater_ping_manager_unittest.cc b/components/component_updater/test/component_updater_ping_manager_unittest.cc
index 39075c8..806c9a8 100644
--- a/components/component_updater/test/component_updater_ping_manager_unittest.cc
+++ b/components/component_updater/test/component_updater_ping_manager_unittest.cc
@@ -23,8 +23,8 @@ class ComponentUpdaterPingManagerTest : public testing::Test {
   void RunThreadsUntilIdle();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   scoped_ptr<TestConfigurator> config_;
diff --git a/components/component_updater/test/crx_downloader_unittest.cc b/components/component_updater/test/crx_downloader_unittest.cc
index de6d6a2..9dbe8fe9 100644
--- a/components/component_updater/test/crx_downloader_unittest.cc
+++ b/components/component_updater/test/crx_downloader_unittest.cc
@@ -43,8 +43,8 @@ class CrxDownloaderTest : public testing::Test {
   virtual ~CrxDownloaderTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void Quit();
   void RunThreads();
diff --git a/components/component_updater/test/request_sender_unittest.cc b/components/component_updater/test/request_sender_unittest.cc
index f93d49d..b1e46d7 100644
--- a/components/component_updater/test/request_sender_unittest.cc
+++ b/components/component_updater/test/request_sender_unittest.cc
@@ -30,8 +30,8 @@ class RequestSenderTest : public testing::Test {
   virtual ~RequestSenderTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void RequestSenderComplete(const net::URLFetcher* source);
 
diff --git a/components/component_updater/test/test_configurator.h b/components/component_updater/test/test_configurator.h
index f3dc6ac..e525db7 100644
--- a/components/component_updater/test/test_configurator.h
+++ b/components/component_updater/test/test_configurator.h
@@ -39,29 +39,29 @@ class TestConfigurator : public Configurator {
   virtual ~TestConfigurator();
 
   // Overrrides for Configurator.
-  virtual int InitialDelay() const OVERRIDE;
-  virtual int NextCheckDelay() OVERRIDE;
-  virtual int StepDelay() const OVERRIDE;
-  virtual int StepDelayMedium() OVERRIDE;
-  virtual int MinimumReCheckWait() const OVERRIDE;
-  virtual int OnDemandDelay() const OVERRIDE;
-  virtual std::vector<GURL> UpdateUrl() const OVERRIDE;
-  virtual std::vector<GURL> PingUrl() const OVERRIDE;
-  virtual base::Version GetBrowserVersion() const OVERRIDE;
-  virtual std::string GetChannel() const OVERRIDE;
-  virtual std::string GetLang() const OVERRIDE;
-  virtual std::string GetOSLongName() const OVERRIDE;
-  virtual std::string ExtraRequestParams() const OVERRIDE;
-  virtual size_t UrlSizeLimit() const OVERRIDE;
-  virtual net::URLRequestContextGetter* RequestContext() const OVERRIDE;
+  virtual int InitialDelay() const override;
+  virtual int NextCheckDelay() override;
+  virtual int StepDelay() const override;
+  virtual int StepDelayMedium() override;
+  virtual int MinimumReCheckWait() const override;
+  virtual int OnDemandDelay() const override;
+  virtual std::vector<GURL> UpdateUrl() const override;
+  virtual std::vector<GURL> PingUrl() const override;
+  virtual base::Version GetBrowserVersion() const override;
+  virtual std::string GetChannel() const override;
+  virtual std::string GetLang() const override;
+  virtual std::string GetOSLongName() const override;
+  virtual std::string ExtraRequestParams() const override;
+  virtual size_t UrlSizeLimit() const override;
+  virtual net::URLRequestContextGetter* RequestContext() const override;
   virtual scoped_refptr<OutOfProcessPatcher> CreateOutOfProcessPatcher()
-      const OVERRIDE;
-  virtual bool DeltasEnabled() const OVERRIDE;
-  virtual bool UseBackgroundDownloader() const OVERRIDE;
+      const override;
+  virtual bool DeltasEnabled() const override;
+  virtual bool UseBackgroundDownloader() const override;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
-      const OVERRIDE;
+      const override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetSingleThreadTaskRunner() const OVERRIDE;
+      GetSingleThreadTaskRunner() const override;
 
   void SetLoopCount(int times);
   void SetRecheckTime(int seconds);
diff --git a/components/component_updater/test/test_installer.h b/components/component_updater/test/test_installer.h
index 00b8c9b..914b52e 100644
--- a/components/component_updater/test/test_installer.h
+++ b/components/component_updater/test/test_installer.h
@@ -23,13 +23,13 @@ class TestInstaller : public ComponentInstaller {
  public:
   TestInstaller();
 
-  virtual void OnUpdateError(int error) OVERRIDE;
+  virtual void OnUpdateError(int error) override;
 
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
   int error() const;
 
@@ -49,7 +49,7 @@ class ReadOnlyTestInstaller : public TestInstaller {
   virtual ~ReadOnlyTestInstaller();
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
@@ -64,10 +64,10 @@ class VersionedTestInstaller : public TestInstaller {
   virtual ~VersionedTestInstaller();
 
   virtual bool Install(const base::DictionaryValue& manifest,
-                       const base::FilePath& unpack_path) OVERRIDE;
+                       const base::FilePath& unpack_path) override;
 
   virtual bool GetInstalledFile(const std::string& file,
-                                base::FilePath* installed_file) OVERRIDE;
+                                base::FilePath* installed_file) override;
 
  private:
   base::FilePath install_directory_;
diff --git a/components/component_updater/test/update_checker_unittest.cc b/components/component_updater/test/update_checker_unittest.cc
index a013dee..574db3f 100644
--- a/components/component_updater/test/update_checker_unittest.cc
+++ b/components/component_updater/test/update_checker_unittest.cc
@@ -41,8 +41,8 @@ class UpdateCheckerTest : public testing::Test {
   virtual ~UpdateCheckerTest();
 
   // Overrides from testing::Test.
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   void UpdateCheckComplete(const GURL& original_url,
                            int error,
diff --git a/components/component_updater/test/url_request_post_interceptor.cc b/components/component_updater/test/url_request_post_interceptor.cc
index 92c4d0c..882db72 100644
--- a/components/component_updater/test/url_request_post_interceptor.cc
+++ b/components/component_updater/test/url_request_post_interceptor.cc
@@ -30,12 +30,12 @@ class URLRequestMockJob : public net::URLRequestSimpleJob {
         response_body_(response_body) {}
 
  protected:
-  virtual int GetResponseCode() const OVERRIDE { return response_code_; }
+  virtual int GetResponseCode() const override { return response_code_; }
 
   virtual int GetData(std::string* mime_type,
                       std::string* charset,
                       std::string* data,
-                      const net::CompletionCallback& callback) const OVERRIDE {
+                      const net::CompletionCallback& callback) const override {
     mime_type->assign("text/plain");
     charset->assign("US-ASCII");
     data->assign(response_body_);
@@ -172,7 +172,7 @@ class URLRequestPostInterceptor::Delegate : public net::URLRequestInterceptor {
 
   virtual net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
 
     // Only intercepts POST.
diff --git a/components/component_updater/test/url_request_post_interceptor.h b/components/component_updater/test/url_request_post_interceptor.h
index ea490bf..01a5ef4 100644
--- a/components/component_updater/test/url_request_post_interceptor.h
+++ b/components/component_updater/test/url_request_post_interceptor.h
@@ -171,7 +171,7 @@ class InterceptorFactory : public URLRequestPostInterceptorFactory {
 class PartialMatch : public URLRequestPostInterceptor::RequestMatcher {
  public:
   explicit PartialMatch(const std::string& expected) : expected_(expected) {}
-  virtual bool Match(const std::string& actual) const OVERRIDE;
+  virtual bool Match(const std::string& actual) const override;
 
  private:
   const std::string expected_;
diff --git a/components/component_updater/update_checker.cc b/components/component_updater/update_checker.cc
index cef3912..3bfff63 100644
--- a/components/component_updater/update_checker.cc
+++ b/components/component_updater/update_checker.cc
@@ -85,7 +85,7 @@ class UpdateCheckerImpl : public UpdateChecker {
   virtual bool CheckForUpdates(
       const std::vector<CrxUpdateItem*>& items_to_check,
       const std::string& additional_attributes,
-      const UpdateCheckCallback& update_check_callback) OVERRIDE;
+      const UpdateCheckCallback& update_check_callback) override;
 
  private:
   void OnRequestSenderComplete(const net::URLFetcher* source);
diff --git a/components/component_updater/url_fetcher_downloader.h b/components/component_updater/url_fetcher_downloader.h
index 576da6c..7a51c20 100644
--- a/components/component_updater/url_fetcher_downloader.h
+++ b/components/component_updater/url_fetcher_downloader.h
@@ -34,13 +34,13 @@ class UrlFetcherDownloader : public CrxDownloader,
 
  private:
   // Overrides for CrxDownloader.
-  virtual void DoStartDownload(const GURL& url) OVERRIDE;
+  virtual void DoStartDownload(const GURL& url) override;
 
   // Overrides for URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
   virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                           int64_t current,
-                                          int64_t total) OVERRIDE;
+                                          int64_t total) override;
   scoped_ptr<net::URLFetcher> url_fetcher_;
   net::URLRequestContextGetter* context_getter_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;