replace OVERRIDE and FINAL with override and final in athena/

athena/main/url_search_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/main/url_search_provider.h"
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_factory.h"
 #include "athena/content/public/scheme_classifier_factory.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 namespace {
 
 // This constant was copied from HistoryURLProvider.
 // TODO(hashimoto): Componentize HistoryURLProvider and delete this.
 const int kScoreForWhatYouTypedResult = 1203;
 
 // The SearchTermsData implementation for Athena.
 class AthenaSearchTermsData : public SearchTermsData {
  public:
   // SearchTermsData:
-  virtual std::string GetSuggestClient() const OVERRIDE {
+  virtual std::string GetSuggestClient() const override {
     return "chrome";
   }
 };
 
 // The templateURLServiceClient for Athena. Mainly for the interaction with
 // history module (see chrome/browser/search_engines for Chrome implementation).
 // TODO(mukai): Implement the contents of this class when it's necessary.
 class AthenaTemplateURLServiceClient : public TemplateURLServiceClient {
  public:
   AthenaTemplateURLServiceClient() {}
   virtual ~AthenaTemplateURLServiceClient() {}
 
  private:
   // TemplateURLServiceClient:
-  virtual void SetOwner(TemplateURLService* owner) OVERRIDE {}
-  virtual void DeleteAllSearchTermsForKeyword(TemplateURLID id) OVERRIDE {}
+  virtual void SetOwner(TemplateURLService* owner) override {}
+  virtual void DeleteAllSearchTermsForKeyword(TemplateURLID id) override {}
   virtual void SetKeywordSearchTermsForURL(
       const GURL& url,
       TemplateURLID id,
-      const base::string16& term) OVERRIDE {}
-  virtual void AddKeywordGeneratedVisit(const GURL& url) OVERRIDE {}
+      const base::string16& term) override {}
+  virtual void AddKeywordGeneratedVisit(const GURL& url) override {}
   virtual void RestoreExtensionInfoIfNecessary(
-      TemplateURL* template_url) OVERRIDE {}
+      TemplateURL* template_url) override {}
 
   DISALLOW_COPY_AND_ASSIGN(AthenaTemplateURLServiceClient);
 };
 
 // The AutocompleteProviderClient for Athena.
 class AthenaAutocompleteProviderClient : public AutocompleteProviderClient {
  public:
   explicit AthenaAutocompleteProviderClient(
       content::BrowserContext* browser_context)
       : browser_context_(browser_context),
         scheme_classifier_(CreateSchemeClassifier(browser_context)) {}
   virtual ~AthenaAutocompleteProviderClient() {}
 
-  virtual net::URLRequestContextGetter* RequestContext() OVERRIDE {
+  virtual net::URLRequestContextGetter* RequestContext() override {
     return browser_context_->GetRequestContext();
   }
-  virtual bool IsOffTheRecord() OVERRIDE {
+  virtual bool IsOffTheRecord() override {
     return browser_context_->IsOffTheRecord();
   }
-  virtual std::string AcceptLanguages() OVERRIDE {
+  virtual std::string AcceptLanguages() override {
     // TODO(hashimoto): Return the value stored in the prefs.
     return "en-US";
   }
-  virtual bool SearchSuggestEnabled() OVERRIDE { return true; }
-  virtual bool ShowBookmarkBar() OVERRIDE { return false; }
-  virtual const AutocompleteSchemeClassifier& SchemeClassifier() OVERRIDE {
+  virtual bool SearchSuggestEnabled() override { return true; }
+  virtual bool ShowBookmarkBar() override { return false; }
+  virtual const AutocompleteSchemeClassifier& SchemeClassifier() override {
     return *scheme_classifier_;
   }
   virtual void Classify(
       const base::string16& text,
       bool prefer_keyword,
       bool allow_exact_keyword_match,
       metrics::OmniboxEventProto::PageClassification page_classification,
       AutocompleteMatch* match,
-      GURL* alternate_nav_url) OVERRIDE {}
-  virtual history::URLDatabase* InMemoryDatabase() OVERRIDE { return NULL; }
+      GURL* alternate_nav_url) override {}
+  virtual history::URLDatabase* InMemoryDatabase() override { return NULL; }
   virtual void DeleteMatchingURLsForKeywordFromHistory(
       history::KeywordID keyword_id,
-      const base::string16& term) OVERRIDE {}
-  virtual bool TabSyncEnabledAndUnencrypted() OVERRIDE { return false; }
-  virtual void PrefetchImage(const GURL& url) OVERRIDE {}
+      const base::string16& term) override {}
+  virtual bool TabSyncEnabledAndUnencrypted() override { return false; }
+  virtual void PrefetchImage(const GURL& url) override {}
 
  private:
   content::BrowserContext* browser_context_;
   scoped_ptr<AutocompleteSchemeClassifier> scheme_classifier_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaAutocompleteProviderClient);
 };
 
 int ACMatchStyleToTagStyle(int styles) {
   int tag_styles = 0;
@@ skipping 52 matching lines @@
     set_relevance(match_.relevance / 1500.0);
 
     UpdateIcon();
     UpdateTitleAndDetails();
   }
 
   virtual ~UrlSearchResult() {}
 
  private:
   // Overriddenn from app_list::SearchResult:
-  virtual void Open(int event_flags) OVERRIDE {
+  virtual void Open(int event_flags) override {
     Activity* activity = ActivityFactory::Get()->CreateWebActivity(
         browser_context_, base::string16(), match_.destination_url);
     Activity::Show(activity);
   }
 
   void UpdateIcon() {
     SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
         AutocompleteMatch::TypeToIcon(match_.type)));
   }
 
@@ skipping 92 matching lines @@
        ++it) {
     if (!it->destination_url.is_valid())
       continue;
 
     Add(scoped_ptr<app_list::SearchResult>(new UrlSearchResult(
         browser_context_, *it)));
   }
 }
 
 }  // namespace athena