Update {virtual,override,final} to follow C++11 style.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with an OS=android build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463
R=bauerb@chromium.org

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

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

33 files changed, 186 insertions, 210 deletions

diff --git a/chrome/browser/android/accessibility/font_size_prefs_android.h b/chrome/browser/android/accessibility/font_size_prefs_android.h
index 05985c6..af8f75d6 100644
--- a/chrome/browser/android/accessibility/font_size_prefs_android.h
+++ b/chrome/browser/android/accessibility/font_size_prefs_android.h
@@ -64,8 +64,8 @@ class FontSizePrefsObserverAndroid : public FontSizePrefsAndroid::Observer {
   static bool Register(JNIEnv* env);
 
   // FontSizePrefs::Observer implementation.
-  virtual void OnChangeFontSize(float font) override;
-  virtual void OnChangeForceEnableZoom(bool enabled) override;
+  void OnChangeFontSize(float font) override;
+  void OnChangeForceEnableZoom(bool enabled) override;
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
diff --git a/chrome/browser/android/banners/app_banner_manager.h b/chrome/browser/android/banners/app_banner_manager.h
index c65d147..12ae72a3 100644
--- a/chrome/browser/android/banners/app_banner_manager.h
+++ b/chrome/browser/android/banners/app_banner_manager.h
@@ -64,7 +64,7 @@ class AppBannerManager : public chrome::BitmapFetcherDelegate,
                          public AppBannerInfoBarDelegate::AppDelegate {
  public:
   AppBannerManager(JNIEnv* env, jobject obj);
-  virtual ~AppBannerManager();
+  ~AppBannerManager() override;
 
   // Destroys the AppBannerManager.
   void Destroy(JNIEnv* env, jobject obj);
@@ -93,20 +93,20 @@ class AppBannerManager : public chrome::BitmapFetcherDelegate,
                                  const SkBitmap& icon);
 
   // WebContentsObserver overrides.
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
-  virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-                             const GURL& validated_url) override;
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  void DidFinishLoad(content::RenderFrameHost* render_frame_host,
+                     const GURL& validated_url) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
   // BitmapFetcherDelegate overrides.
-  virtual void OnFetchComplete(const GURL url, const SkBitmap* bitmap) override;
+  void OnFetchComplete(const GURL url, const SkBitmap* bitmap) override;
 
   // AppBannerInfoBarDelegate::AppDelegate overrides.
-  virtual void Block() const override;
-  virtual void Install() const override;
-  virtual gfx::Image GetIcon() const override;
+  void Block() const override;
+  void Install() const override;
+  gfx::Image GetIcon() const override;
 
  private:
   // Gets the preferred icon size for the banner icons.
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.h b/chrome/browser/android/bookmarks/bookmarks_bridge.h
index cb182cf..8a283e8 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.h
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.h
@@ -152,7 +152,7 @@ class BookmarksBridge : public bookmarks::BaseBookmarkModelObserver,
   base::string16 GetTitle(const BookmarkNode* node) const;
 
  private:
-  virtual ~BookmarksBridge();
+  ~BookmarksBridge() override;
 
   base::android::ScopedJavaLocalRef<jobject> CreateJavaBookmark(
       const BookmarkNode* node);
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
index 75461b7..cddfb02 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim.h
@@ -121,7 +121,7 @@ class PartnerBookmarksShim : public base::SupportsUserData::Data {
 
  private:
   explicit PartnerBookmarksShim(PrefService* prefs);
-  virtual ~PartnerBookmarksShim();
+  ~PartnerBookmarksShim() override;
 
   const BookmarkNode* GetNodeByID(const BookmarkNode* parent, int64 id) const;
   void ReloadNodeMapping();
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index 304fc64..ecafdbd 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -60,7 +60,7 @@ class PartnerBookmarksShimTest : public testing::Test {
 
  protected:
   // testing::Test
-  virtual void SetUp() override {
+  void SetUp() override {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
 
@@ -68,7 +68,7 @@ class PartnerBookmarksShimTest : public testing::Test {
     bookmarks::test::WaitForBookmarkModelToLoad(model_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     PartnerBookmarksShim::ClearInBrowserContextForTesting(profile_.get());
     PartnerBookmarksShim::ClearPartnerModelForTesting();
     PartnerBookmarksShim::EnablePartnerBookmarksEditing();
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.h b/chrome/browser/android/chrome_web_contents_delegate_android.h
index cd13a8b..c1c6811 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.h
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.h
@@ -35,53 +35,52 @@ class ChromeWebContentsDelegateAndroid
       public content::NotificationObserver {
  public:
   ChromeWebContentsDelegateAndroid(JNIEnv* env, jobject obj);
-  virtual ~ChromeWebContentsDelegateAndroid();
+  ~ChromeWebContentsDelegateAndroid() override;
 
-  virtual void LoadingStateChanged(content::WebContents* source,
-                                   bool to_different_document) override;
-  virtual void RunFileChooser(content::WebContents* web_contents,
-                              const content::FileChooserParams& params)
-                              override;
-  virtual void CloseContents(content::WebContents* web_contents) override;
-  virtual void FindReply(content::WebContents* web_contents,
-                         int request_id,
-                         int number_of_matches,
-                         const gfx::Rect& selection_rect,
-                         int active_match_ordinal,
-                         bool final_update) override;
-  virtual void FindMatchRectsReply(content::WebContents* web_contents,
-                                   int version,
-                                   const std::vector<gfx::RectF>& rects,
-                                   const gfx::RectF& active_rect) override;
-  virtual content::JavaScriptDialogManager*
-  GetJavaScriptDialogManager(content::WebContents* source) override;
-  virtual void RequestMediaAccessPermission(
+  void LoadingStateChanged(content::WebContents* source,
+                           bool to_different_document) override;
+  void RunFileChooser(content::WebContents* web_contents,
+                      const content::FileChooserParams& params) override;
+  void CloseContents(content::WebContents* web_contents) override;
+  void FindReply(content::WebContents* web_contents,
+                 int request_id,
+                 int number_of_matches,
+                 const gfx::Rect& selection_rect,
+                 int active_match_ordinal,
+                 bool final_update) override;
+  void FindMatchRectsReply(content::WebContents* web_contents,
+                           int version,
+                           const std::vector<gfx::RectF>& rects,
+                           const gfx::RectF& active_rect) override;
+  content::JavaScriptDialogManager* GetJavaScriptDialogManager(
+      content::WebContents* source) override;
+  void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) override;
-  virtual bool CheckMediaAccessPermission(
-      content::WebContents* web_contents,
-      const GURL& security_origin,
-      content::MediaStreamType type) override;
-  virtual bool RequestPpapiBrokerPermission(
+  bool CheckMediaAccessPermission(content::WebContents* web_contents,
+                                  const GURL& security_origin,
+                                  content::MediaStreamType type) override;
+  bool RequestPpapiBrokerPermission(
       content::WebContents* web_contents,
       const GURL& url,
       const base::FilePath& plugin_path,
       const base::Callback<void(bool)>& callback) override;
-  virtual content::WebContents* OpenURLFromTab(
+  content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) override;
-  virtual void AddNewContents(content::WebContents* source,
-                              content::WebContents* new_contents,
-                              WindowOpenDisposition disposition,
-                              const gfx::Rect& initial_rect,
-                              bool user_gesture,
-                              bool* was_blocked) override;
+  void AddNewContents(content::WebContents* source,
+                      content::WebContents* new_contents,
+                      WindowOpenDisposition disposition,
+                      const gfx::Rect& initial_rect,
+                      bool user_gesture,
+                      bool* was_blocked) override;
+
  private:
   // NotificationObserver implementation.
-  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;
 
   void OnFindResultAvailable(content::WebContents* web_contents,
                              const FindNotificationDetails* find_result);
diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.cc b/chrome/browser/android/dev_tools_manager_delegate_android.cc
index a5ea927..b7561ad 100644
--- a/chrome/browser/android/dev_tools_manager_delegate_android.cc
+++ b/chrome/browser/android/dev_tools_manager_delegate_android.cc
@@ -55,17 +55,17 @@ base::TimeTicks GetLastActiveTimeForAgentHost(
 class TargetBase : public content::DevToolsTarget {
  public:
   // content::DevToolsTarget implementation:
-  virtual std::string GetParentId() const override { return std::string(); }
+  std::string GetParentId() const override { return std::string(); }
 
-  virtual std::string GetTitle() const override { return title_; }
+  std::string GetTitle() const override { return title_; }
 
-  virtual std::string GetDescription() const override { return std::string(); }
+  std::string GetDescription() const override { return std::string(); }
 
-  virtual GURL GetURL() const override { return url_; }
+  GURL GetURL() const override { return url_; }
 
-  virtual GURL GetFaviconURL() const override { return favicon_url_; }
+  GURL GetFaviconURL() const override { return favicon_url_; }
 
-  virtual base::TimeTicks GetLastActivityTime() const override {
+  base::TimeTicks GetLastActivityTime() const override {
     return last_activity_time_;
   }
 
@@ -110,15 +110,11 @@ class TabTarget : public TargetBase {
   }
 
   // content::DevToolsTarget implementation:
-  virtual std::string GetId() const override {
-    return base::IntToString(tab_id_);
-  }
+  std::string GetId() const override { return base::IntToString(tab_id_); }
 
-  virtual std::string GetType() const override {
-    return kTargetTypePage;
-  }
+  std::string GetType() const override { return kTargetTypePage; }
 
-  virtual bool IsAttached() const override {
+  bool IsAttached() const override {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
@@ -129,7 +125,7 @@ class TabTarget : public TargetBase {
     return DevToolsAgentHost::IsDebuggerAttached(web_contents);
   }
 
-  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
+  scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
@@ -151,7 +147,7 @@ class TabTarget : public TargetBase {
     return DevToolsAgentHost::GetOrCreateFor(web_contents);
   }
 
-  virtual bool Activate() const override {
+  bool Activate() const override {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
@@ -160,7 +156,7 @@ class TabTarget : public TargetBase {
     return true;
   }
 
-  virtual bool Close() const override {
+  bool Close() const override {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
@@ -207,11 +203,9 @@ class NonTabTarget : public TargetBase {
   }
 
   // content::DevToolsTarget implementation:
-  virtual std::string GetId() const override {
-    return agent_host_->GetId();
-  }
+  std::string GetId() const override { return agent_host_->GetId(); }
 
-  virtual std::string GetType() const override {
+  std::string GetType() const override {
     switch (agent_host_->GetType()) {
       case DevToolsAgentHost::TYPE_WEB_CONTENTS:
         if (TabModelList::begin() == TabModelList::end()) {
@@ -228,21 +222,15 @@ class NonTabTarget : public TargetBase {
     return kTargetTypeOther;
   }
 
-  virtual bool IsAttached() const override {
-    return agent_host_->IsAttached();
-  }
+  bool IsAttached() const override { return agent_host_->IsAttached(); }
 
-  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
+  scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
     return agent_host_;
   }
 
-  virtual bool Activate() const override {
-    return agent_host_->Activate();
-  }
+  bool Activate() const override { return agent_host_->Activate(); }
 
-  virtual bool Close() const override {
-    return agent_host_->Close();
-  }
+  bool Close() const override { return agent_host_->Close(); }
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.h b/chrome/browser/android/dev_tools_manager_delegate_android.h
index 7e1f459..1a0f51e4 100644
--- a/chrome/browser/android/dev_tools_manager_delegate_android.h
+++ b/chrome/browser/android/dev_tools_manager_delegate_android.h
@@ -14,20 +14,19 @@
 class DevToolsManagerDelegateAndroid : public content::DevToolsManagerDelegate {
  public:
   DevToolsManagerDelegateAndroid();
-  virtual ~DevToolsManagerDelegateAndroid();
+  ~DevToolsManagerDelegateAndroid() override;
 
   // content::DevToolsManagerDelegate implementation.
-  virtual void Inspect(content::BrowserContext* browser_context,
-                       content::DevToolsAgentHost* agent_host) override;
-  virtual void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host,
-                                         bool attached) override;
-  virtual base::DictionaryValue* HandleCommand(
+  void Inspect(content::BrowserContext* browser_context,
+               content::DevToolsAgentHost* agent_host) override;
+  void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host,
+                                 bool attached) override;
+  base::DictionaryValue* HandleCommand(
       content::DevToolsAgentHost* agent_host,
       base::DictionaryValue* command_dict) override;
-  virtual scoped_ptr<content::DevToolsTarget> CreateNewTarget(
-      const GURL& url) override;
-  virtual void EnumerateTargets(TargetCallback callback) override;
-  virtual std::string GetPageThumbnailData(const GURL& url) override;
+  scoped_ptr<content::DevToolsTarget> CreateNewTarget(const GURL& url) override;
+  void EnumerateTargets(TargetCallback callback) override;
+  std::string GetPageThumbnailData(const GURL& url) override;
 
  private:
   scoped_ptr<DevToolsNetworkProtocolHandler> network_protocol_handler_;
diff --git a/chrome/browser/android/dom_distiller/feedback_reporter_android.h b/chrome/browser/android/dom_distiller/feedback_reporter_android.h
index 284da3b..7af1562 100644
--- a/chrome/browser/android/dom_distiller/feedback_reporter_android.h
+++ b/chrome/browser/android/dom_distiller/feedback_reporter_android.h
@@ -23,7 +23,7 @@ namespace android {
 class FeedbackReporterAndroid : content::WebContentsObserver {
  public:
   FeedbackReporterAndroid(JNIEnv* env, jobject obj);
-  virtual ~FeedbackReporterAndroid();
+  ~FeedbackReporterAndroid() override;
 
   // Destroys the FeedbackReporterAndroid.
   void Destroy(JNIEnv* env, jobject obj);
@@ -32,7 +32,7 @@ class FeedbackReporterAndroid : content::WebContentsObserver {
   void ReplaceWebContents(JNIEnv* env, jobject obj, jobject jweb_contents);
 
   // WebContentsObserver implementation:
-  virtual void DidNavigateMainFrame(
+  void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
 
diff --git a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
index ce88776..8018b4c 100644
--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h
@@ -21,7 +21,7 @@ namespace android {
 class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
  public:
   EnhancedBookmarksBridge(JNIEnv* env, jobject obj, Profile* profile);
-  virtual ~EnhancedBookmarksBridge();
+  ~EnhancedBookmarksBridge() override;
   void Destroy(JNIEnv*, jobject);
 
   base::android::ScopedJavaLocalRef<jstring> GetBookmarkDescription(
@@ -73,7 +73,7 @@ class EnhancedBookmarksBridge : public BookmarkServerServiceObserver {
 
   // BookmarkServerServiceObserver
   // Called on changes to cluster data or search results are returned.
-  virtual void OnChange(BookmarkServerService* service) override;
+  void OnChange(BookmarkServerService* service) override;
 
  private:
   bool IsEditable(const BookmarkNode* node) const;
diff --git a/chrome/browser/android/foreign_session_helper.h b/chrome/browser/android/foreign_session_helper.h
index 0f1ad00..5f79bd4 100644
--- a/chrome/browser/android/foreign_session_helper.h
+++ b/chrome/browser/android/foreign_session_helper.h
@@ -37,14 +37,14 @@ class ForeignSessionHelper : public content::NotificationObserver {
   void DeleteForeignSession(JNIEnv* env, jobject obj, jstring session_tag);
 
   // NotificationObserver implemenation
-  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;
 
   static bool RegisterForeignSessionHelper(JNIEnv* env);
 
  private:
-  virtual ~ForeignSessionHelper();
+  ~ForeignSessionHelper() override;
 
   Profile* profile_;  // weak
   base::android::ScopedJavaGlobalRef<jobject> callback_;
diff --git a/chrome/browser/android/intercept_download_resource_throttle.h b/chrome/browser/android/intercept_download_resource_throttle.h
index f476a87..6ecfb43 100644
--- a/chrome/browser/android/intercept_download_resource_throttle.h
+++ b/chrome/browser/android/intercept_download_resource_throttle.h
@@ -25,11 +25,11 @@ class InterceptDownloadResourceThrottle : public content::ResourceThrottle {
                                     int request_id);
 
   // content::ResourceThrottle implementation:
-  virtual void WillProcessResponse(bool* defer) override;
-  virtual const char* GetNameForLogging() const override;
+  void WillProcessResponse(bool* defer) override;
+  const char* GetNameForLogging() const override;
 
  private:
-  virtual ~InterceptDownloadResourceThrottle();
+  ~InterceptDownloadResourceThrottle() override;
 
   void ProcessDownloadRequest();
   // Set to true when if we want chrome to handle the download.
diff --git a/chrome/browser/android/logo_bridge.cc b/chrome/browser/android/logo_bridge.cc
index b673ebc..6c97a04 100644
--- a/chrome/browser/android/logo_bridge.cc
+++ b/chrome/browser/android/logo_bridge.cc
@@ -53,11 +53,11 @@ class LogoObserverAndroid : public search_provider_logos::LogoObserver {
     j_logo_observer_.Reset(env, j_logo_observer);
   }
 
-  virtual ~LogoObserverAndroid() {}
+  ~LogoObserverAndroid() override {}
 
   // seach_provider_logos::LogoObserver:
-  virtual void OnLogoAvailable(const search_provider_logos::Logo* logo,
-                               bool from_cache) override {
+  void OnLogoAvailable(const search_provider_logos::Logo* logo,
+                       bool from_cache) override {
     if (!logo_bridge_)
       return;
 
@@ -67,9 +67,7 @@ class LogoObserverAndroid : public search_provider_logos::LogoObserver {
         env, j_logo_observer_.obj(), j_logo.obj(), from_cache);
   }
 
-  virtual void OnObserverRemoved() override {
-    delete this;
-  }
+  void OnObserverRemoved() override { delete this; }
 
  private:
   // The associated LogoBridge. We won't call back to Java if the LogoBridge has
diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc
index 7e38e4f..ac0351c 100644
--- a/chrome/browser/android/logo_service.cc
+++ b/chrome/browser/android/logo_service.cc
@@ -58,18 +58,16 @@ class LogoDecoderDelegate : public ImageDecoder::Delegate {
         base::TimeDelta::FromSeconds(kDecodeLogoTimeoutSeconds));
   }
 
-  virtual ~LogoDecoderDelegate() {
-    image_decoder_->set_delegate(NULL);
-  }
+  ~LogoDecoderDelegate() override { image_decoder_->set_delegate(NULL); }
 
   // ImageDecoder::Delegate:
-  virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) override {
+  void OnImageDecoded(const ImageDecoder* decoder,
+                      const SkBitmap& decoded_image) override {
     image_decoded_callback_.Run(decoded_image);
     delete this;
   }
 
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override {
+  void OnDecodeImageFailed(const ImageDecoder* decoder) override {
     image_decoded_callback_.Run(SkBitmap());
     delete this;
   }
@@ -85,10 +83,10 @@ class LogoDecoderDelegate : public ImageDecoder::Delegate {
 class ChromeLogoDelegate : public search_provider_logos::LogoDelegate {
  public:
   ChromeLogoDelegate() {}
-  virtual ~ChromeLogoDelegate() {}
+  ~ChromeLogoDelegate() override {}
 
   // search_provider_logos::LogoDelegate:
-  virtual void DecodeUntrustedImage(
+  void DecodeUntrustedImage(
       const scoped_refptr<base::RefCountedString>& encoded_image,
       base::Callback<void(const SkBitmap&)> image_decoded_callback) override {
     scoped_refptr<ImageDecoder> image_decoder = new ImageDecoder(
diff --git a/chrome/browser/android/logo_service.h b/chrome/browser/android/logo_service.h
index fe4075b..441c6e2 100644
--- a/chrome/browser/android/logo_service.h
+++ b/chrome/browser/android/logo_service.h
@@ -22,7 +22,7 @@ class Profile;
 class LogoService : public KeyedService {
  public:
   explicit LogoService(Profile* profile);
-  virtual ~LogoService();
+  ~LogoService() override;
 
   // Gets the logo for the default search provider and notifies |observer|
   // with the results.
@@ -46,10 +46,10 @@ class LogoServiceFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<LogoServiceFactory>;
 
   LogoServiceFactory();
-  virtual ~LogoServiceFactory();
+  ~LogoServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 };
 
diff --git a/chrome/browser/android/most_visited_sites.h b/chrome/browser/android/most_visited_sites.h
index b01c56e..6e5a7f5 100644
--- a/chrome/browser/android/most_visited_sites.h
+++ b/chrome/browser/android/most_visited_sites.h
@@ -45,7 +45,7 @@ class MostVisitedSites : public ProfileSyncServiceObserver,
   void RecordOpenedMostVisitedItem(JNIEnv* env, jobject obj, jint index);
 
   // ProfileSyncServiceObserver implementation.
-  virtual void OnStateChanged() override;
+  void OnStateChanged() override;
 
   // Registers JNI methods.
   static bool Register(JNIEnv* env);
@@ -57,7 +57,7 @@ class MostVisitedSites : public ProfileSyncServiceObserver,
     SUGGESTIONS_SERVICE
   };
 
-  virtual ~MostVisitedSites();
+  ~MostVisitedSites() override;
   void QueryMostVisitedURLs();
 
   // Initialize the query to Top Sites. Called if the SuggestionsService is not
diff --git a/chrome/browser/android/omnibox/answers_image_bridge.cc b/chrome/browser/android/omnibox/answers_image_bridge.cc
index 09860af..41d215d 100644
--- a/chrome/browser/android/omnibox/answers_image_bridge.cc
+++ b/chrome/browser/android/omnibox/answers_image_bridge.cc
@@ -31,11 +31,11 @@ class AnswersImageObserverAndroid : public BitmapFetcherService::Observer {
     java_answers_image_observer_.Reset(env, java_answers_image_observer);
   }
 
-  virtual ~AnswersImageObserverAndroid() {}
+  ~AnswersImageObserverAndroid() override {}
 
   // AnswersImageObserver:
-  virtual void OnImageChanged(BitmapFetcherService::RequestId request_id,
-                              const SkBitmap& answers_image) override {
+  void OnImageChanged(BitmapFetcherService::RequestId request_id,
+                      const SkBitmap& answers_image) override {
     DCHECK(!answers_image.empty());
 
     JNIEnv* env = base::android::AttachCurrentThread();
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
index bcac0f2..7a85f8a 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -73,11 +73,11 @@ class ZeroSuggestPrefetcher : public AutocompleteControllerDelegate {
   explicit ZeroSuggestPrefetcher(Profile* profile);
 
  private:
-  virtual ~ZeroSuggestPrefetcher();
+  ~ZeroSuggestPrefetcher() override;
   void SelfDestruct();
 
   // AutocompleteControllerDelegate:
-  virtual void OnResultChanged(bool default_match_changed) override;
+  void OnResultChanged(bool default_match_changed) override;
 
   scoped_ptr<AutocompleteController> controller_;
   base::OneShotTimer<ZeroSuggestPrefetcher> expire_timer_;
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.h b/chrome/browser/android/omnibox/autocomplete_controller_android.h
index d8e150f..6ae205c 100644
--- a/chrome/browser/android/omnibox/autocomplete_controller_android.h
+++ b/chrome/browser/android/omnibox/autocomplete_controller_android.h
@@ -71,7 +71,7 @@ class AutocompleteControllerAndroid : public AutocompleteControllerDelegate,
           jlong elapsed_time_since_input_change);
 
   // KeyedService:
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
   class Factory : public BrowserContextKeyedServiceFactory {
    public:
@@ -82,26 +82,26 @@ class AutocompleteControllerAndroid : public AutocompleteControllerDelegate,
     static Factory* GetInstance();
 
    protected:
-    virtual content::BrowserContext* GetBrowserContextToUse(
+    content::BrowserContext* GetBrowserContextToUse(
         content::BrowserContext* context) const override;
 
    private:
     friend struct DefaultSingletonTraits<Factory>;
 
     Factory();
-    virtual ~Factory();
+    ~Factory() override;
 
     // BrowserContextKeyedServiceFactory
-    virtual KeyedService* BuildServiceInstanceFor(
+    KeyedService* BuildServiceInstanceFor(
         content::BrowserContext* profile) const override;
   };
 
  private:
-  virtual ~AutocompleteControllerAndroid();
+  ~AutocompleteControllerAndroid() override;
   void InitJNI(JNIEnv* env, jobject obj);
 
   // AutocompleteControllerDelegate implementation.
-  virtual void OnResultChanged(bool default_match_changed) override;
+  void OnResultChanged(bool default_match_changed) override;
 
   // Notifies the Java AutocompleteController that suggestions were received
   // based on the text the user typed in last.
diff --git a/chrome/browser/android/password_ui_view_android.h b/chrome/browser/android/password_ui_view_android.h
index 35071a3..2d826d9 100644
--- a/chrome/browser/android/password_ui_view_android.h
+++ b/chrome/browser/android/password_ui_view_android.h
@@ -21,18 +21,17 @@
 class PasswordUIViewAndroid : public PasswordUIView {
  public:
   PasswordUIViewAndroid(JNIEnv* env, jobject);
-  virtual ~PasswordUIViewAndroid();
+  ~PasswordUIViewAndroid() override;
 
   // PasswordUIView implementation.
-  virtual Profile* GetProfile() override;
-  virtual void ShowPassword(size_t index, const base::string16& password_value)
-      override;
-  virtual void SetPasswordList(
+  Profile* GetProfile() override;
+  void ShowPassword(size_t index,
+                    const base::string16& password_value) override;
+  void SetPasswordList(
       const ScopedVector<autofill::PasswordForm>& password_list,
       bool show_passwords) override;
-  virtual void SetPasswordExceptionList(
-      const ScopedVector<autofill::PasswordForm>& password_exception_list)
-      override;
+  void SetPasswordExceptionList(const ScopedVector<autofill::PasswordForm>&
+                                    password_exception_list) override;
 
   // Calls from Java.
   base::android::ScopedJavaLocalRef<jobject> GetSavedPasswordEntry(
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index c37b4e0..b0e8aec 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -284,7 +284,7 @@ class ClearBrowsingDataObserver : public BrowsingDataRemover::Observer {
       : weak_chrome_native_preferences_(env, obj) {
   }
 
-  virtual void OnBrowsingDataRemoverDone() override {
+  void OnBrowsingDataRemoverDone() override {
     // Just as a BrowsingDataRemover deletes itself when done, we delete ourself
     // when done.  No need to remove ourself as an observer given the lifetime
     // of BrowsingDataRemover.
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index 07adbf4..d21bf9d 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -366,7 +366,7 @@ class SiteDataDeleteHelper :
  private:
   friend class base::RefCountedThreadSafe<SiteDataDeleteHelper>;
 
-  virtual ~SiteDataDeleteHelper() {}
+  ~SiteDataDeleteHelper() override {}
 
   Profile* profile_;
 
diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.h b/chrome/browser/android/provider/bookmark_model_observer_task.h
index 6438554..eeb644d 100644
--- a/chrome/browser/android/provider/bookmark_model_observer_task.h
+++ b/chrome/browser/android/provider/bookmark_model_observer_task.h
@@ -28,33 +28,32 @@ class BookmarkModelObserverTask : public BookmarkModelTask,
                                   public bookmarks::BookmarkModelObserver {
  public:
   explicit BookmarkModelObserverTask(bookmarks::BookmarkModel* bookmark_model);
-  virtual ~BookmarkModelObserverTask();
+  ~BookmarkModelObserverTask() override;
 
   // bookmarks::BookmarkModelObserver:
-  virtual void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
-                                   bool ids_reassigned) override;
-  virtual void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
-                                 const BookmarkNode* old_parent,
-                                 int old_index,
-                                 const BookmarkNode* new_parent,
-                                 int new_index) override;
-  virtual void BookmarkNodeAdded(bookmarks::BookmarkModel* model,
-                                 const BookmarkNode* parent,
-                                 int index) override;
-  virtual void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
-                                   const BookmarkNode* parent,
-                                   int old_index,
-                                   const BookmarkNode* node,
+  void BookmarkModelLoaded(bookmarks::BookmarkModel* model,
+                           bool ids_reassigned) override;
+  void BookmarkNodeMoved(bookmarks::BookmarkModel* model,
+                         const BookmarkNode* old_parent,
+                         int old_index,
+                         const BookmarkNode* new_parent,
+                         int new_index) override;
+  void BookmarkNodeAdded(bookmarks::BookmarkModel* model,
+                         const BookmarkNode* parent,
+                         int index) override;
+  void BookmarkNodeRemoved(bookmarks::BookmarkModel* model,
+                           const BookmarkNode* parent,
+                           int old_index,
+                           const BookmarkNode* node,
+                           const std::set<GURL>& removed_urls) override;
+  void BookmarkAllUserNodesRemoved(bookmarks::BookmarkModel* model,
                                    const std::set<GURL>& removed_urls) override;
-  virtual void BookmarkAllUserNodesRemoved(
-      bookmarks::BookmarkModel* model,
-      const std::set<GURL>& removed_urls) override;
-  virtual void BookmarkNodeChanged(bookmarks::BookmarkModel* model,
-                                   const BookmarkNode* node) override;
-  virtual void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
-                                          const BookmarkNode* node) override;
-  virtual void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model,
-                                             const BookmarkNode* node) override;
+  void BookmarkNodeChanged(bookmarks::BookmarkModel* model,
+                           const BookmarkNode* node) override;
+  void BookmarkNodeFaviconChanged(bookmarks::BookmarkModel* model,
+                                  const BookmarkNode* node) override;
+  void BookmarkNodeChildrenReordered(bookmarks::BookmarkModel* model,
+                                     const BookmarkNode* node) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelObserverTask);
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
index 946e353..6191d63 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.cc
+++ b/chrome/browser/android/provider/chrome_browser_provider.cc
@@ -248,7 +248,7 @@ class RemoveBookmarkTask : public BookmarkModelObserverTask {
       : BookmarkModelObserverTask(model),
         deleted_(0),
         id_to_delete_(kInvalidBookmarkId) {}
-  virtual ~RemoveBookmarkTask() {}
+  ~RemoveBookmarkTask() override {}
 
   int Run(const int64 id) {
     id_to_delete_ = id;
@@ -267,12 +267,11 @@ class RemoveBookmarkTask : public BookmarkModelObserverTask {
   }
 
   // Verify that the bookmark was actually removed. Called synchronously.
-  virtual void BookmarkNodeRemoved(
-      BookmarkModel* bookmark_model,
-      const BookmarkNode* parent,
-      int old_index,
-      const BookmarkNode* node,
-      const std::set<GURL>& removed_urls) override {
+  void BookmarkNodeRemoved(BookmarkModel* bookmark_model,
+                           const BookmarkNode* parent,
+                           int old_index,
+                           const BookmarkNode* node,
+                           const std::set<GURL>& removed_urls) override {
     if (bookmark_model == model() && node->id() == id_to_delete_)
         ++deleted_;
   }
@@ -290,7 +289,7 @@ class RemoveAllUserBookmarksTask : public BookmarkModelObserverTask {
   explicit RemoveAllUserBookmarksTask(BookmarkModel* model)
       : BookmarkModelObserverTask(model) {}
 
-  virtual ~RemoveAllUserBookmarksTask() {}
+  ~RemoveAllUserBookmarksTask() override {}
 
   void Run() {
     RunOnUIThreadBlocking::Run(
@@ -313,7 +312,7 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask {
       : BookmarkModelObserverTask(model),
         updated_(0),
         id_to_update_(kInvalidBookmarkId){}
-  virtual ~UpdateBookmarkTask() {}
+  ~UpdateBookmarkTask() override {}
 
   int Run(const int64 id,
           const base::string16& title,
@@ -355,8 +354,8 @@ class UpdateBookmarkTask : public BookmarkModelObserverTask {
   }
 
   // Verify that the bookmark was actually updated. Called synchronously.
-  virtual void BookmarkNodeChanged(BookmarkModel* bookmark_model,
-                                   const BookmarkNode* node) override {
+  void BookmarkNodeChanged(BookmarkModel* bookmark_model,
+                           const BookmarkNode* node) override {
     if (bookmark_model == model() && node->id() == id_to_update_)
       ++updated_;
   }
diff --git a/chrome/browser/android/provider/chrome_browser_provider.h b/chrome/browser/android/provider/chrome_browser_provider.h
index a2ff280..3fc4312 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.h
+++ b/chrome/browser/android/provider/chrome_browser_provider.h
@@ -172,14 +172,13 @@ class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver,
                                                              jstring url);
 
  private:
-  virtual ~ChromeBrowserProvider();
+  ~ChromeBrowserProvider() override;
 
   // Override bookmarks::BaseBookmarkModelObserver.
-  virtual void BookmarkModelChanged() override;
-  virtual void ExtensiveBookmarkChangesBeginning(
-      bookmarks::BookmarkModel* model) override;
-  virtual void ExtensiveBookmarkChangesEnded(
+  void BookmarkModelChanged() override;
+  void ExtensiveBookmarkChangesBeginning(
       bookmarks::BookmarkModel* model) override;
+  void ExtensiveBookmarkChangesEnded(bookmarks::BookmarkModel* model) override;
 
   // Deals with updates to the history service.
   void OnHistoryChanged();
diff --git a/chrome/browser/android/recently_closed_tabs_bridge.h b/chrome/browser/android/recently_closed_tabs_bridge.h
index ac11f3f..01eb50d 100644
--- a/chrome/browser/android/recently_closed_tabs_bridge.h
+++ b/chrome/browser/android/recently_closed_tabs_bridge.h
@@ -34,16 +34,16 @@ class RecentlyClosedTabsBridge : public TabRestoreServiceObserver {
 
   // Observer callback for TabRestoreServiceObserver. Notifies the registered
   // callback that the recently closed tabs list has changed.
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
+  void TabRestoreServiceChanged(TabRestoreService* service) override;
 
   // Observer callback when our associated TabRestoreService is destroyed.
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
+  void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
   // Registers JNI methods.
   static bool Register(JNIEnv* env);
 
  private:
-  virtual ~RecentlyClosedTabsBridge();
+  ~RecentlyClosedTabsBridge() override;
 
   // Construct and initialize tab_restore_service_ if it's NULL.
   // tab_restore_service_ may still be NULL, however, in incognito mode.
diff --git a/chrome/browser/android/shortcut_helper.h b/chrome/browser/android/shortcut_helper.h
index ca81d03..5b866df 100644
--- a/chrome/browser/android/shortcut_helper.h
+++ b/chrome/browser/android/shortcut_helper.h
@@ -78,8 +78,8 @@ class ShortcutHelper : public content::WebContentsObserver {
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // WebContentsObserver
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
-  virtual void WebContentsDestroyed() override;
+  bool OnMessageReceived(const IPC::Message& message) override;
+  void WebContentsDestroyed() override;
 
   // Adds a shortcut to the launcher using a FaviconRawBitmapResult.
   // Must be called from a WorkerPool task.
@@ -103,7 +103,7 @@ class ShortcutHelper : public content::WebContentsObserver {
     MANIFEST_ICON_STATUS_DONE
   };
 
-  virtual ~ShortcutHelper();
+  ~ShortcutHelper() override;
 
   void Destroy();
 
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
index c94d203..a2e96e8 100644
--- a/chrome/browser/android/signin/signin_manager_android.cc
+++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -61,7 +61,7 @@ class ProfileDataRemover : public BrowsingDataRemover::Observer {
     remover_->Remove(BrowsingDataRemover::REMOVE_ALL, BrowsingDataHelper::ALL);
   }
 
-  virtual ~ProfileDataRemover() {}
+  ~ProfileDataRemover() override {}
 
   void OnBrowsingDataRemoverDone() override {
     remover_->RemoveObserver(this);
diff --git a/chrome/browser/android/signin/signin_manager_android.h b/chrome/browser/android/signin/signin_manager_android.h
index ce4a95d..23424f8 100644
--- a/chrome/browser/android/signin/signin_manager_android.h
+++ b/chrome/browser/android/signin/signin_manager_android.h
@@ -67,7 +67,7 @@ class SigninManagerAndroid : public MergeSessionHelper::Observer {
   jboolean IsSignedInOnNative(JNIEnv* env, jobject obj);
 
  private:
-  virtual ~SigninManagerAndroid();
+  ~SigninManagerAndroid() override;
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   void OnPolicyRegisterDone(const std::string& dm_token,
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 57c019b..182e799 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -71,7 +71,7 @@ class TabAndroid : public CoreTabHelperDelegate,
   static void AttachTabHelpers(content::WebContents* web_contents);
 
   TabAndroid(JNIEnv* env, jobject obj);
-  virtual ~TabAndroid();
+  ~TabAndroid() override;
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
@@ -111,25 +111,25 @@ class TabAndroid : public CoreTabHelperDelegate,
 
   // CoreTabHelperDelegate ----------------------------------------------------
 
-  virtual void SwapTabContents(content::WebContents* old_contents,
-                               content::WebContents* new_contents,
-                               bool did_start_load,
-                               bool did_finish_load) override;
+  void SwapTabContents(content::WebContents* old_contents,
+                       content::WebContents* new_contents,
+                       bool did_start_load,
+                       bool did_finish_load) override;
 
   // Overridden from InstantServiceObserver:
   void DefaultSearchProviderChanged() override;
 
   // Overridden from SearchTabHelperDelegate:
-  virtual void OnWebContentsInstantSupportDisabled(
+  void OnWebContentsInstantSupportDisabled(
       const content::WebContents* web_contents) override;
 
   // NotificationObserver -----------------------------------------------------
-  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;
 
   // FaviconTabHelperObserver -----------------------------------------------
-  virtual void OnFaviconAvailable(const gfx::Image& image) override;
+  void OnFaviconAvailable(const gfx::Image& image) override;
 
   // Methods called from Java via JNI -----------------------------------------
 
diff --git a/chrome/browser/android/thumbnail/thumbnail.h b/chrome/browser/android/thumbnail/thumbnail.h
index 49de59c..79ed868 100644
--- a/chrome/browser/android/thumbnail/thumbnail.h
+++ b/chrome/browser/android/thumbnail/thumbnail.h
@@ -42,7 +42,7 @@ class Thumbnail : public ui::UIResourceClientAndroid {
       float scale,
       ui::UIResourceProvider* ui_resource_provider,
       ThumbnailDelegate* thumbnail_delegate);
-  virtual ~Thumbnail();
+  ~Thumbnail() override;
 
   TabId tab_id() const { return tab_id_; }
   base::Time time_stamp() const { return time_stamp_; }
@@ -57,11 +57,11 @@ class Thumbnail : public ui::UIResourceClientAndroid {
   void CreateUIResource();
 
   // content::UIResourceClient implementation.
-  virtual cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
-                                         bool resource_lost) override;
+  cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
+                                 bool resource_lost) override;
 
   // ui::UIResourceClientAndroid implementation.
-  virtual void UIResourceIsInvalid() override;
+  void UIResourceIsInvalid() override;
 
  protected:
   Thumbnail(TabId tab_id,
diff --git a/chrome/browser/android/thumbnail/thumbnail_store.h b/chrome/browser/android/thumbnail/thumbnail_store.h
index 94cdbba..8ad0c1a 100644
--- a/chrome/browser/android/thumbnail/thumbnail_store.h
+++ b/chrome/browser/android/thumbnail/thumbnail_store.h
@@ -50,7 +50,7 @@ class ThumbnailStore : ThumbnailDelegate {
                  size_t write_queue_max_size,
                  bool use_approximation_thumbnail);
 
-  virtual ~ThumbnailStore();
+  ~ThumbnailStore() override;
 
   void SetUIResourceProvider(ui::UIResourceProvider* ui_resource_provider);
 
@@ -72,7 +72,7 @@ class ThumbnailStore : ThumbnailDelegate {
           post_decompress_callback);
 
   // ThumbnailDelegate implementation
-  virtual void InvalidateCachedThumbnail(Thumbnail* thumbnail) override;
+  void InvalidateCachedThumbnail(Thumbnail* thumbnail) override;
 
  private:
   class ThumbnailMetaData {
diff --git a/chrome/browser/android/webapps/single_tab_mode_tab_helper.h b/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
index a79fd2e..744aee3 100644
--- a/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
+++ b/chrome/browser/android/webapps/single_tab_mode_tab_helper.h
@@ -30,7 +30,7 @@ class SingleTabModeTabHelper
   // Checks if the ID pair is blocked from creating new windows. IO-thread only.
   static bool IsRegistered(int32 process_id, int32 routing_id);
 
-  virtual ~SingleTabModeTabHelper();
+  ~SingleTabModeTabHelper() override;
 
   // Handles opening the given URL through the TabModel.
   void HandleOpenUrl(const BlockedWindowParams& params);
@@ -40,10 +40,8 @@ class SingleTabModeTabHelper
   void PermanentlyBlockAllNewWindows();
 
   // content::WebContentsObserver
-  virtual void RenderViewCreated(content::RenderViewHost* render_view_host)
-      override;
-  virtual void RenderViewDeleted(content::RenderViewHost* render_view_host)
-      override;
+  void RenderViewCreated(content::RenderViewHost* render_view_host) override;
+  void RenderViewDeleted(content::RenderViewHost* render_view_host) override;
 
  private:
   explicit SingleTabModeTabHelper(content::WebContents* web_contents);