Standardize usage of virtual/override/final specifiers.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=pkasting@chromium.org

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

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

106 files changed, 341 insertions, 374 deletions

diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_views.h b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
index 7685edb..7550ae7 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
@@ -14,14 +14,14 @@ class AppListServiceViews;
 class AppListControllerDelegateViews : public AppListControllerDelegateImpl {
  public:
   explicit AppListControllerDelegateViews(AppListServiceViews* service);
-  virtual ~AppListControllerDelegateViews();
+  ~AppListControllerDelegateViews() override;
 
   // AppListControllerDelegate overrides:
-  virtual gfx::Rect GetAppListBounds() override;
-  virtual void ViewClosing() override;
-  virtual void OnShowChildDialog() override;
-  virtual void OnCloseChildDialog() override;
-  virtual bool CanDoCreateShortcutsFlow() override;
+  gfx::Rect GetAppListBounds() override;
+  void ViewClosing() override;
+  void OnShowChildDialog() override;
+  void OnCloseChildDialog() override;
+  bool CanDoCreateShortcutsFlow() override;
 
  private:
   AppListServiceViews* service_;  // Weak. Owns us.
diff --git a/chrome/browser/ui/app_list/app_list_positioner_unittest.cc b/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
index 50f7cde..12697bae 100644
--- a/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
@@ -46,7 +46,7 @@ class AppListPositionerUnitTest : public testing::Test {
         new AppListPositioner(display_, view_size, kMinDistanceFromEdge));
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     display_.set_bounds(gfx::Rect(0, 0, kScreenWidth, kScreenHeight));
     // Assume there is a menu bar at the top of the screen, as on Mac and Unity.
     // This is for cases where the work area does not fill the entire screen.
diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc
index 9951fd7..85f41ec 100644
--- a/chrome/browser/ui/app_list/app_list_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc
@@ -77,7 +77,7 @@ class AppListServiceUnitTest : public testing::Test {
  public:
   AppListServiceUnitTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     SetupWithCommandLine(CommandLine(CommandLine::NO_PROGRAM));
   }
 
diff --git a/chrome/browser/ui/app_list/app_list_service_views.h b/chrome/browser/ui/app_list/app_list_service_views.h
index 258e823..7268ccf 100644
--- a/chrome/browser/ui/app_list/app_list_service_views.h
+++ b/chrome/browser/ui/app_list/app_list_service_views.h
@@ -18,7 +18,7 @@ class AppListServiceViews : public AppListServiceImpl,
  public:
   explicit AppListServiceViews(
       scoped_ptr<AppListControllerDelegate> controller_delegate);
-  virtual ~AppListServiceViews();
+  ~AppListServiceViews() override;
 
   // Set |can_dismiss| to prevent the app list dismissing when losing focus. For
   // example, while showing a window-modal dialog.
@@ -31,20 +31,20 @@ class AppListServiceViews : public AppListServiceImpl,
   virtual void OnViewBeingDestroyed();
 
   // AppListService overrides:
-  virtual void Init(Profile* initial_profile) override;
-  virtual void ShowForProfile(Profile* requested_profile) override;
-  virtual void DismissAppList() override;
-  virtual bool IsAppListVisible() const override;
-  virtual gfx::NativeWindow GetAppListWindow() override;
-  virtual Profile* GetCurrentAppListProfile() override;
-  virtual AppListControllerDelegate* GetControllerDelegate() override;
+  void Init(Profile* initial_profile) override;
+  void ShowForProfile(Profile* requested_profile) override;
+  void DismissAppList() override;
+  bool IsAppListVisible() const override;
+  gfx::NativeWindow GetAppListWindow() override;
+  Profile* GetCurrentAppListProfile() override;
+  AppListControllerDelegate* GetControllerDelegate() override;
 
   // AppListServiceImpl overrides:
-  virtual void CreateForProfile(Profile* requested_profile) override;
-  virtual void DestroyAppList() override;
+  void CreateForProfile(Profile* requested_profile) override;
+  void DestroyAppList() override;
 
   // AppListShowerDelegate overrides:
-  virtual AppListViewDelegate* GetViewDelegateForCreate() override;
+  AppListViewDelegate* GetViewDelegateForCreate() override;
 
  private:
   // Responsible for creating the app list and responding to profile changes.
diff --git a/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc b/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
index 8360507..856b5f2 100644
--- a/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
@@ -19,32 +19,26 @@ class FakeAppListShower : public AppListShower {
       : AppListShower(delegate), has_view_(false), visible_(false) {}
 
   // AppListShower:
-  virtual void HandleViewBeingDestroyed() override {
+  void HandleViewBeingDestroyed() override {
     AppListShower::HandleViewBeingDestroyed();
     has_view_ = false;
     visible_ = false;
   }
 
-  virtual bool IsAppListVisible() const override { return visible_; }
+  bool IsAppListVisible() const override { return visible_; }
 
-  virtual app_list::AppListView* MakeViewForCurrentProfile() override {
+  app_list::AppListView* MakeViewForCurrentProfile() override {
     has_view_ = true;
     return NULL;
   }
 
-  virtual void UpdateViewForNewProfile() override {}
+  void UpdateViewForNewProfile() override {}
 
-  virtual void Show() override {
-    visible_ = true;
-  }
+  void Show() override { visible_ = true; }
 
-  virtual void Hide() override {
-    visible_ = false;
-  }
+  void Hide() override { visible_ = false; }
 
-  virtual bool HasView() const override {
-    return has_view_;
-  }
+  bool HasView() const override { return has_view_; }
 
  private:
   bool has_view_;
@@ -62,31 +56,28 @@ class AppListShowerUnitTest : public testing::Test,
       : views_created_(0),
         views_dismissed_(0) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     shower_.reset(new FakeAppListShower(this));
     profile1_ = CreateProfile("p1").Pass();
     profile2_ = CreateProfile("p2").Pass();
   }
 
-  virtual void TearDown() override {
-  }
+  void TearDown() override {}
 
   scoped_ptr<FakeProfile> CreateProfile(const std::string& name) {
     return make_scoped_ptr(new FakeProfile(name));
   }
 
   // AppListShowerDelegate:
-  virtual AppListViewDelegate* GetViewDelegateForCreate() override {
-    return NULL;
-  }
+  AppListViewDelegate* GetViewDelegateForCreate() override { return NULL; }
 
   bool HasKeepAlive() const {
     return shower_->keep_alive_.get() != NULL;
   }
 
-  virtual void OnViewCreated() override { ++views_created_; }
-  virtual void OnViewDismissed() override { ++views_dismissed_; }
-  virtual void MoveNearCursor(app_list::AppListView* view) override {}
+  void OnViewCreated() override { ++views_created_; }
+  void OnViewDismissed() override { ++views_dismissed_; }
+  void MoveNearCursor(app_list::AppListView* view) override {}
 
  protected:
   scoped_ptr<FakeAppListShower> shower_;
diff --git a/chrome/browser/ui/app_list/app_list_test_util.h b/chrome/browser/ui/app_list/app_list_test_util.h
index 44b6d2e..f47c273 100644
--- a/chrome/browser/ui/app_list/app_list_test_util.h
+++ b/chrome/browser/ui/app_list/app_list_test_util.h
@@ -15,9 +15,9 @@ class AppListTestBase : public extensions::ExtensionServiceTestBase {
   static const char kPackagedApp2Id[];
 
   AppListTestBase();
-  virtual ~AppListTestBase();
+  ~AppListTestBase() override;
 
-  virtual void SetUp() override;
+  void SetUp() override;
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_TEST_UTIL_H_
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
index 1eb50ba..2cec64f 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -93,8 +93,8 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
   void ToggleSpeechRecognition() override;
   void ShowForProfileByPath(const base::FilePath& profile_path) override;
 #if defined(TOOLKIT_VIEWS)
-  virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
-  virtual std::vector<views::View*> CreateCustomPageWebViews(
+  views::View* CreateStartPageWebView(const gfx::Size& size) override;
+  std::vector<views::View*> CreateCustomPageWebViews(
       const gfx::Size& size) override;
 #endif
   bool IsSpeechRecognitionEnabled() override;
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index a228aca2..e31e712 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
@@ -72,17 +72,15 @@ const size_t kDefaultAppCount = 3u;
 class ExtensionAppModelBuilderTest : public AppListTestBase {
  public:
   ExtensionAppModelBuilderTest() {}
-  virtual ~ExtensionAppModelBuilderTest() {}
+  ~ExtensionAppModelBuilderTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     AppListTestBase::SetUp();
 
     CreateBuilder();
   }
 
-  virtual void TearDown() override {
-    ResetBuilder();
-  }
+  void TearDown() override { ResetBuilder(); }
 
  protected:
   // Creates a new builder, destroying any existing one.
diff --git a/chrome/browser/ui/app_list/model_pref_updater_unittest.cc b/chrome/browser/ui/app_list/model_pref_updater_unittest.cc
index 9eae550..78acf79 100644
--- a/chrome/browser/ui/app_list/model_pref_updater_unittest.cc
+++ b/chrome/browser/ui/app_list/model_pref_updater_unittest.cc
@@ -31,9 +31,9 @@ class TestExtensionAppItem : public AppListItem {
 class ModelPrefUpdaterTest : public testing::Test {
  public:
   ModelPrefUpdaterTest() {}
-  virtual ~ModelPrefUpdaterTest() {}
+  ~ModelPrefUpdaterTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     AppListPrefs::RegisterProfilePrefs(pref_service_.registry());
     prefs_.reset(AppListPrefs::Create(&pref_service_));
     model_.reset(new AppListTestModel());
diff --git a/chrome/browser/ui/app_list/profile_loader_unittest.cc b/chrome/browser/ui/app_list/profile_loader_unittest.cc
index 8d397b5..10433c9 100644
--- a/chrome/browser/ui/app_list/profile_loader_unittest.cc
+++ b/chrome/browser/ui/app_list/profile_loader_unittest.cc
@@ -13,7 +13,7 @@
 
 class ProfileLoaderUnittest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     last_callback_result_ = NULL;
     profile1_.reset(
         new FakeProfile("p1", base::FilePath(FILE_PATH_LITERAL("profile1"))));
diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index 123eea4..0dd9944 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -31,10 +31,10 @@ bool MoreRelevant(const SearchResult* result1, const SearchResult* result2) {
 class AppSearchProviderTest : public AppListTestBase {
  public:
   AppSearchProviderTest() {}
-  virtual ~AppSearchProviderTest() {}
+  ~AppSearchProviderTest() override {}
 
   // AppListTestBase overrides:
-  virtual void SetUp() override {
+  void SetUp() override {
     AppListTestBase::SetUp();
 
     app_search_.reset(new AppSearchProvider(profile_.get(), NULL));
diff --git a/chrome/browser/ui/app_list/search/history_unittest.cc b/chrome/browser/ui/app_list/search/history_unittest.cc
index 349b345..9546215 100644
--- a/chrome/browser/ui/app_list/search/history_unittest.cc
+++ b/chrome/browser/ui/app_list/search/history_unittest.cc
@@ -33,7 +33,7 @@ const size_t kMaxSecondary = 2;
 class HistoryDataLoadWaiter : public HistoryDataObserver {
  public:
   explicit HistoryDataLoadWaiter(HistoryData* data) : data_(data)  {}
-  virtual ~HistoryDataLoadWaiter() {}
+  ~HistoryDataLoadWaiter() override {}
 
   void Wait() {
     data_->AddObserver(this);
@@ -46,9 +46,7 @@ class HistoryDataLoadWaiter : public HistoryDataObserver {
 
  private:
   // HistoryDataObserver overrides:
-  virtual void OnHistoryDataLoadedFromStore() override {
-    run_loop_->Quit();
-  }
+  void OnHistoryDataLoadedFromStore() override { run_loop_->Quit(); }
 
   HistoryData* data_;  // Not owned.
   scoped_ptr<base::RunLoop> run_loop_;
@@ -89,17 +87,15 @@ class StoreFlushWaiter {
 class SearchHistoryTest : public testing::Test {
  public:
   SearchHistoryTest() {}
-  virtual ~SearchHistoryTest() {}
+  ~SearchHistoryTest() override {}
 
   // testing::Test overrides:
-  virtual void SetUp() override {
+  void SetUp() override {
     worker_pool_ = new base::SequencedWorkerPool(1, "AppLauncherTest");
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     CreateHistory();
   }
-  virtual void TearDown() override {
-    Flush();
-  }
+  void TearDown() override { Flush(); }
 
   void CreateHistory() {
     const char kStoreDataFileName[] = "app-launcher-test";
diff --git a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
index ce634f3..7e4beb9 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
+++ b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
@@ -163,7 +163,7 @@ const char kThreeValidResults[] = "{"
 class PeopleProviderTest : public InProcessBrowserTest {
  public:
   PeopleProviderTest() {}
-  virtual ~PeopleProviderTest() {}
+  ~PeopleProviderTest() override {}
 
   // InProcessBrowserTest overrides:
   void SetUpOnMainThread() override {
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
index 2a7ac1c..ef895b0 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
@@ -97,7 +97,7 @@ ParsedSearchResult kParsedThreeResults[] = {
 class WebstoreProviderTest : public InProcessBrowserTest {
  public:
   WebstoreProviderTest() {}
-  virtual ~WebstoreProviderTest() {}
+  ~WebstoreProviderTest() override {}
 
   // InProcessBrowserTest overrides:
   void SetUpOnMainThread() override {
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
index ad4957c..f8884cc 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
@@ -15,14 +15,14 @@ class ActiveDesktopMonitor;
 class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
  public:
   ChromeBrowserMainExtraPartsAura();
-  virtual ~ChromeBrowserMainExtraPartsAura();
+  ~ChromeBrowserMainExtraPartsAura() override;
 
   // Overridden from ChromeBrowserMainExtraParts:
-  virtual void PreEarlyInitialization() override;
-  virtual void ToolkitInitialized() override;
-  virtual void PreCreateThreads() override;
-  virtual void PreProfileInit() override;
-  virtual void PostMainMessageLoopRun() override;
+  void PreEarlyInitialization() override;
+  void ToolkitInitialized() override;
+  void PreCreateThreads() override;
+  void PreProfileInit() override;
+  void PostMainMessageLoopRun() override;
 
  private:
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
index 6a153ce..3ec56e7 100644
--- a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
+++ b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
@@ -22,16 +22,16 @@ class WebContents;
 class WebDragBookmarkHandlerAura : public content::WebDragDestDelegate {
  public:
   WebDragBookmarkHandlerAura();
-  virtual ~WebDragBookmarkHandlerAura();
+  ~WebDragBookmarkHandlerAura() override;
 
   // Overridden from content::WebDragDestDelegate:
-  virtual void DragInitialize(content::WebContents* contents) override;
-  virtual void OnDragOver() override;
-  virtual void OnDragEnter() override;
-  virtual void OnDrop() override;
-  virtual void OnDragLeave() override;
+  void DragInitialize(content::WebContents* contents) override;
+  void OnDragOver() override;
+  void OnDragEnter() override;
+  void OnDrop() override;
+  void OnDragLeave() override;
 
-  virtual void OnReceiveDragData(const ui::OSExchangeData& data) override;
+  void OnReceiveDragData(const ui::OSExchangeData& data) override;
 
  private:
   // The BookmarkTabHelper.
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 14a488f..37d99bf 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -1503,7 +1503,7 @@ class AutofillDialogControllerSecurityTest :
     public AutofillDialogControllerTest {
  public:
   AutofillDialogControllerSecurityTest() {}
-  virtual ~AutofillDialogControllerSecurityTest() {}
+  ~AutofillDialogControllerSecurityTest() override {}
 
   void SetUpCommandLine(CommandLine* command_line) override {
     CHECK(!command_line->HasSwitch(::switches::kReduceSecurityForTesting));
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index c13d159..1d4e4d1 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -401,12 +401,12 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
   AutofillDialogControllerTest(): form_structure_(NULL) {}
 
   // testing::Test implementation:
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     Reset();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     if (controller_)
       controller_->ViewClosed();
     ChromeRenderViewHostTestHarness::TearDown();
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
index a55168b..3d5a686 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
@@ -69,7 +69,7 @@ class AutofillPopupControllerBrowserTest
       public content::WebContentsObserver {
  public:
   AutofillPopupControllerBrowserTest() {}
-  virtual ~AutofillPopupControllerBrowserTest() {}
+  ~AutofillPopupControllerBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     content::WebContents* web_contents =
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index a29be41..fef22be 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -124,9 +124,9 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
   AutofillPopupControllerUnitTest()
       : autofill_client_(new MockAutofillClient()),
         autofill_popup_controller_(NULL) {}
-  virtual ~AutofillPopupControllerUnitTest() {}
+  ~AutofillPopupControllerUnitTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     ContentAutofillDriver::CreateForWebContentsAndDelegate(
@@ -146,7 +146,7 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
             external_delegate_->GetWeakPtr(),gfx::Rect());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // This will make sure the controller and the view (if any) are both
     // cleaned up.
     if (autofill_popup_controller_)
diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
index 6508a65..7454e2a 100644
--- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
@@ -50,7 +50,7 @@ class GeneratedCreditCardBubbleControllerTest : public testing::Test {
             content::WebContentsTester::CreateTestWebContents(
                 &profile_, NULL)) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Attaches immediately to |test_web_contents_| so a test version will exist
     // before a non-test version can be created.
     new TestGeneratedCreditCardBubbleController(test_web_contents_.get());
diff --git a/chrome/browser/ui/autofill/popup_controller_common_unittest.cc b/chrome/browser/ui/autofill/popup_controller_common_unittest.cc
index 576d055..0319b07 100644
--- a/chrome/browser/ui/autofill/popup_controller_common_unittest.cc
+++ b/chrome/browser/ui/autofill/popup_controller_common_unittest.cc
@@ -15,7 +15,7 @@ namespace autofill {
 class PopupControllerBaseTest : public ChromeRenderViewHostTestHarness {
  public:
   PopupControllerBaseTest() {}
-  virtual ~PopupControllerBaseTest() {}
+  ~PopupControllerBaseTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PopupControllerBaseTest);
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index c7aa5b1..cf68e9c 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -92,7 +92,7 @@ class CloseObserver : public content::WebContentsObserver {
 class PopupBlockerBrowserTest : public InProcessBrowserTest {
  public:
   PopupBlockerBrowserTest() {}
-  virtual ~PopupBlockerBrowserTest() {}
+  ~PopupBlockerBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
index b7e9770..a370213 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
@@ -23,7 +23,7 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
  protected:
   class Window : public TestBrowserWindow {
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
index 86388e1..accdfaf 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -50,7 +50,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     TestingProfile::Builder builder;
     profile_ = builder.Build();
     profile_->CreateBookmarkModel(true);
@@ -59,7 +59,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
     AddTestData(model_);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
 
     // Flush the message loop to make application verifiers happy.
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
index afc0f0a..9e5cf01 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -46,8 +46,8 @@ class RecentlyUsedFoldersComboModelTest : public testing::Test {
  public:
   RecentlyUsedFoldersComboModelTest();
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   BookmarkModel* GetModel();
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index 3eef13c..faee306 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -328,7 +328,7 @@ class BrowserCommandControllerFullscreenTest
     : public BrowserWithTestWindowTest {
  public:
   BrowserCommandControllerFullscreenTest() {}
-  virtual ~BrowserCommandControllerFullscreenTest() {}
+  ~BrowserCommandControllerFullscreenTest() override {}
 
   // BrowserWithTestWindowTest overrides:
   BrowserWindow* CreateBrowserWindow() override {
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc
index c2e24ce..f4eaeee 100644
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -26,7 +26,7 @@ namespace {
 
 class BrowserInstantControllerTest : public InstantUnitTestBase {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch", "Group1 use_cacheable_ntp:1"));
     InstantUnitTestBase::SetUp();
diff --git a/chrome/browser/ui/browser_unittest.cc b/chrome/browser/ui/browser_unittest.cc
index a7e79f6..6054666 100644
--- a/chrome/browser/ui/browser_unittest.cc
+++ b/chrome/browser/ui/browser_unittest.cc
@@ -22,7 +22,7 @@ using content::WebContentsTester;
 class BrowserUnitTest : public BrowserWithTestWindowTest {
  public:
   BrowserUnitTest() {}
-  virtual ~BrowserUnitTest() {}
+  ~BrowserUnitTest() override {}
 
   // Caller owns the memory.
   WebContents* CreateTestWebContents() {
@@ -69,7 +69,7 @@ TEST_F(BrowserUnitTest, ReloadCrashedTab) {
 class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
  public:
   BrowserBookmarkBarTest() {}
-  virtual ~BrowserBookmarkBarTest() {}
+  ~BrowserBookmarkBarTest() override {}
 
  protected:
   BookmarkBar::State window_bookmark_bar_state() const {
@@ -78,7 +78,7 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
   }
 
   // BrowserWithTestWindowTest:
-  virtual void SetUp() override {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     static_cast<BookmarkBarStateTestBrowserWindow*>(
         browser()->window())->set_browser(browser());
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc
index d4c9715..d477a2e 100644
--- a/chrome/browser/ui/certificate_dialogs.cc
+++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -69,12 +69,14 @@ class Exporter : public ui::SelectFileDialog::Listener {
            gfx::NativeWindow parent,
            net::X509Certificate::OSCertHandles::iterator certs_begin,
            net::X509Certificate::OSCertHandles::iterator certs_end);
-  virtual ~Exporter();
+  ~Exporter() override;
 
   // SelectFileDialog::Listener implemenation.
-  virtual void FileSelected(const base::FilePath& path,
-                            int index, void* params) override;
-  virtual void FileSelectionCanceled(void* params) override;
+  void FileSelected(const base::FilePath& path,
+                    int index,
+                    void* params) override;
+  void FileSelectionCanceled(void* params) override;
+
  private:
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 0df6c26..a484dc6 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -28,7 +28,7 @@ using content::WebContentsTester;
 
 class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     TabSpecificContentSettings::CreateForWebContents(web_contents());
     InfoBarService::CreateForWebContents(web_contents());
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h
index 7afde30..60c7cb5 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.h
+++ b/chrome/browser/ui/crypto_module_delegate_nss.h
@@ -30,7 +30,7 @@ class ChromeNSSCryptoModuleDelegate
                                 const net::HostPortPair& server,
                                 crypto::ScopedPK11Slot slot);
 
-  virtual ~ChromeNSSCryptoModuleDelegate();
+  ~ChromeNSSCryptoModuleDelegate() override;
 
   // Must be called on IO thread. Creates a delegate and returns it
   // synchronously or asynchronously to |callback|. If the delegate could not be
@@ -43,12 +43,12 @@ class ChromeNSSCryptoModuleDelegate
           callback);
 
   // crypto::NSSCryptoModuleDelegate implementation.
-  virtual crypto::ScopedPK11Slot RequestSlot() override;
+  crypto::ScopedPK11Slot RequestSlot() override;
 
   // crypto::CryptoModuleBlockingPasswordDelegate implementation.
-  virtual std::string RequestPassword(const std::string& slot_name,
-                                      bool retry,
-                                      bool* cancelled) override;
+  std::string RequestPassword(const std::string& slot_name,
+                              bool retry,
+                              bool* cancelled) override;
 
  private:
   void ShowDialog(const std::string& slot_name, bool retry);
diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc
index 732a885..699c100 100644
--- a/chrome/browser/ui/find_bar/find_backend_unittest.cc
+++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc
@@ -19,7 +19,7 @@ using content::WebContentsTester;
 
 class FindBackendTest : public ChromeRenderViewHostTestHarness {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     FindTabHelper::CreateForWebContents(web_contents());
   }
diff --git a/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc
index db7f86b..4d4f96e 100644
--- a/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/flash_fullscreen_interactive_browsertest.cc
@@ -54,7 +54,7 @@ bool RunLoopUntil(const base::Callback<bool()>& condition) {
 class FlashFullscreenInteractiveBrowserTest : public OutOfProcessPPAPITest {
  public:
   FlashFullscreenInteractiveBrowserTest() {}
-  virtual ~FlashFullscreenInteractiveBrowserTest() {}
+  ~FlashFullscreenInteractiveBrowserTest() override {}
 
  protected:
   content::WebContents* GetActiveWebContents() const {
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
index 00e4030..4700c79 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
@@ -217,7 +217,7 @@ class FullscreenControllerStateUnitTest : public BrowserWithTestWindowTest,
   FullscreenControllerStateUnitTest();
 
   // FullscreenControllerStateTest:
-  virtual void SetUp() override;
+  void SetUp() override;
   BrowserWindow* CreateBrowserWindow() override;
   void ChangeWindowFullscreenState() override;
   const char* GetWindowStateString() override;
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
index 0123baf..810cfa1 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
@@ -63,10 +63,10 @@ const std::vector<OverscrollPref>& GetOverscrollPrefs() {
 class GesturePrefsObserver : public KeyedService {
  public:
   explicit GesturePrefsObserver(PrefService* prefs);
-  virtual ~GesturePrefsObserver();
+  ~GesturePrefsObserver() override;
 
   // KeyedService implementation.
-  virtual void Shutdown() override;
+  void Shutdown() override;
 
  private:
   // Notification callback invoked when browser-side preferences
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
index 4c0eb4c..bd3514a 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
@@ -22,19 +22,19 @@ class GesturePrefsObserverFactoryAura
   friend struct DefaultSingletonTraits<GesturePrefsObserverFactoryAura>;
 
   GesturePrefsObserverFactoryAura();
-  virtual ~GesturePrefsObserverFactoryAura();
+  ~GesturePrefsObserverFactoryAura() override;
 
   void RegisterOverscrollPrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // BrowserContextKeyedServiceFactory:
-  virtual KeyedService* BuildServiceInstanceFor(
+  KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override;
-  virtual void RegisterProfilePrefs(
+  void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
-  virtual bool ServiceIsCreatedWithBrowserContext() const override;
-  virtual content::BrowserContext* GetBrowserContextToUse(
+  bool ServiceIsCreatedWithBrowserContext() const override;
+  content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override;
-  virtual bool ServiceIsNULLWhileTesting() const override;
+  bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(GesturePrefsObserverFactoryAura);
 };
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
index 54a9557..0ceaab7 100644
--- a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
+++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
@@ -33,16 +33,16 @@ class AppIndicatorIcon : public views::StatusIconLinux {
   AppIndicatorIcon(std::string id,
                    const gfx::ImageSkia& image,
                    const base::string16& tool_tip);
-  virtual ~AppIndicatorIcon();
+  ~AppIndicatorIcon() override;
 
   // Indicates whether libappindicator so could be opened.
   static bool CouldOpen();
 
   // Overridden from views::StatusIconLinux:
-  virtual void SetImage(const gfx::ImageSkia& image) override;
-  virtual void SetToolTip(const base::string16& tool_tip) override;
-  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
-  virtual void RefreshPlatformContextMenu() override;
+  void SetImage(const gfx::ImageSkia& image) override;
+  void SetToolTip(const base::string16& tool_tip) override;
+  void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
+  void RefreshPlatformContextMenu() override;
 
  private:
   void SetImageFromFile(const base::FilePath& icon_file_path);
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
index ac9d088..daa2c88 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
@@ -44,10 +44,9 @@ class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
         size_(size) {
   }
 
-  virtual ~ButtonImageSkiaSource() {
-  }
+  ~ButtonImageSkiaSource() override {}
 
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) override {
+  gfx::ImageSkiaRep GetImageForScale(float scale) override {
     int w = size_.width() * scale;
     int h = size_.height() * scale;
     return gfx::ImageSkiaRep(
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h
index 6217b92..fba75e1 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h
@@ -30,15 +30,15 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
   Gtk2Border(Gtk2UI* gtk2_ui,
              views::LabelButton* owning_button,
              scoped_ptr<views::LabelButtonBorder> border);
-  virtual ~Gtk2Border();
+  ~Gtk2Border() override;
 
   // Overridden from views::Border:
-  virtual void Paint(const views::View& view, gfx::Canvas* canvas) override;
-  virtual gfx::Insets GetInsets() const override;
-  virtual gfx::Size GetMinimumSize() const override;
+  void Paint(const views::View& view, gfx::Canvas* canvas) override;
+  gfx::Insets GetInsets() const override;
+  gfx::Size GetMinimumSize() const override;
 
   // Overridden from views::NativeThemeChangeObserver:
-  virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
+  void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
 
  private:
   void PaintState(const ui::NativeTheme::State state,
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
index 2401977..89934a7 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
@@ -30,13 +30,13 @@ class AppIndicatorIconMenu;
 class Gtk2StatusIcon : public views::StatusIconLinux {
  public:
   Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
-  virtual ~Gtk2StatusIcon();
+  ~Gtk2StatusIcon() override;
 
   // Overridden from views::StatusIconLinux:
-  virtual void SetImage(const gfx::ImageSkia& image) override;
-  virtual void SetToolTip(const base::string16& tool_tip) override;
-  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
-  virtual void RefreshPlatformContextMenu() override;
+  void SetImage(const gfx::ImageSkia& image) override;
+  void SetToolTip(const base::string16& tool_tip) override;
+  void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
+  void RefreshPlatformContextMenu() override;
 
  private:
   CHROMEG_CALLBACK_0(Gtk2StatusIcon, void, OnClick, GtkStatusIcon*);
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index f982065..a2620f5 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -44,7 +44,7 @@ class GConfListener;
 class Gtk2UI : public views::LinuxUI {
  public:
   Gtk2UI();
-  virtual ~Gtk2UI();
+  ~Gtk2UI() override;
 
   typedef base::Callback<ui::NativeTheme*(aura::Window* window)>
       NativeThemeGetter;
@@ -63,61 +63,59 @@ class Gtk2UI : public views::LinuxUI {
                                int height) const;
 
   // ui::LinuxInputMethodContextFactory:
-  virtual scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+  scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
       ui::LinuxInputMethodContextDelegate* delegate) const override;
 
   // gfx::LinuxFontDelegate:
-  virtual gfx::FontRenderParams GetDefaultFontRenderParams() const override;
-  virtual scoped_ptr<gfx::ScopedPangoFontDescription>
-      GetDefaultPangoFontDescription() const override;
-  virtual double GetFontDPI() const override;
+  gfx::FontRenderParams GetDefaultFontRenderParams() const override;
+  scoped_ptr<gfx::ScopedPangoFontDescription> GetDefaultPangoFontDescription()
+      const override;
+  double GetFontDPI() const override;
 
   // ui::LinuxShellDialog:
-  virtual ui::SelectFileDialog* CreateSelectFileDialog(
+  ui::SelectFileDialog* CreateSelectFileDialog(
       ui::SelectFileDialog::Listener* listener,
       ui::SelectFilePolicy* policy) const override;
 
   // ui::LinuxUI:
-  virtual void Initialize() override;
-  virtual gfx::Image GetThemeImageNamed(int id) const override;
-  virtual bool GetColor(int id, SkColor* color) const override;
-  virtual bool HasCustomImage(int id) const override;
-  virtual SkColor GetFocusRingColor() const override;
-  virtual SkColor GetThumbActiveColor() const override;
-  virtual SkColor GetThumbInactiveColor() const override;
-  virtual SkColor GetTrackColor() const override;
-  virtual SkColor GetActiveSelectionBgColor() const override;
-  virtual SkColor GetActiveSelectionFgColor() const override;
-  virtual SkColor GetInactiveSelectionBgColor() const override;
-  virtual SkColor GetInactiveSelectionFgColor() const override;
-  virtual double GetCursorBlinkInterval() const override;
-  virtual ui::NativeTheme* GetNativeTheme(aura::Window* window) const override;
-  virtual void SetNativeThemeOverride(const NativeThemeGetter& callback)
-      override;
-  virtual bool GetDefaultUsesSystemTheme() const override;
-  virtual void SetDownloadCount(int count) const override;
-  virtual void SetProgressFraction(float percentage) const override;
-  virtual bool IsStatusIconSupported() const override;
-  virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
+  void Initialize() override;
+  gfx::Image GetThemeImageNamed(int id) const override;
+  bool GetColor(int id, SkColor* color) const override;
+  bool HasCustomImage(int id) const override;
+  SkColor GetFocusRingColor() const override;
+  SkColor GetThumbActiveColor() const override;
+  SkColor GetThumbInactiveColor() const override;
+  SkColor GetTrackColor() const override;
+  SkColor GetActiveSelectionBgColor() const override;
+  SkColor GetActiveSelectionFgColor() const override;
+  SkColor GetInactiveSelectionBgColor() const override;
+  SkColor GetInactiveSelectionFgColor() const override;
+  double GetCursorBlinkInterval() const override;
+  ui::NativeTheme* GetNativeTheme(aura::Window* window) const override;
+  void SetNativeThemeOverride(const NativeThemeGetter& callback) override;
+  bool GetDefaultUsesSystemTheme() const override;
+  void SetDownloadCount(int count) const override;
+  void SetProgressFraction(float percentage) const override;
+  bool IsStatusIconSupported() const override;
+  scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
       const gfx::ImageSkia& image,
       const base::string16& tool_tip) const override;
-  virtual gfx::Image GetIconForContentType(
-      const std::string& content_type, int size) const override;
-  virtual scoped_ptr<views::Border> CreateNativeBorder(
+  gfx::Image GetIconForContentType(const std::string& content_type,
+                                   int size) const override;
+  scoped_ptr<views::Border> CreateNativeBorder(
       views::LabelButton* owning_button,
       scoped_ptr<views::LabelButtonBorder> border) override;
-  virtual void AddWindowButtonOrderObserver(
+  void AddWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) override;
-  virtual void RemoveWindowButtonOrderObserver(
+  void RemoveWindowButtonOrderObserver(
       views::WindowButtonOrderObserver* observer) override;
-  virtual bool UnityIsRunning() override;
-  virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
-  virtual void NotifyWindowManagerStartupComplete() override;
+  bool UnityIsRunning() override;
+  NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
+  void NotifyWindowManagerStartupComplete() override;
 
   // ui::TextEditKeybindingDelegate:
-  virtual bool MatchEvent(
-      const ui::Event& event,
-      std::vector<ui::TextEditCommandAuraLinux>* commands) override;
+  bool MatchEvent(const ui::Event& event,
+                  std::vector<ui::TextEditCommandAuraLinux>* commands) override;
 
  private:
   typedef std::map<int, SkColor> ColorMap;
diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
index 5dc3bda..78e9c89 100644
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
@@ -22,20 +22,20 @@ class NativeThemeGtk2 : public ui::NativeThemeBase {
   static NativeThemeGtk2* instance();
 
   // Overridden from ui::NativeThemeBase:
-  virtual gfx::Size GetPartSize(Part part,
-                                State state,
-                                const ExtraParams& extra) const override;
-  virtual void Paint(SkCanvas* canvas,
-                     Part part,
-                     State state,
-                     const gfx::Rect& rect,
-                     const ExtraParams& extra) const override;
-  virtual SkColor GetSystemColor(ColorId color_id) const override;
-  virtual void PaintMenuPopupBackground(
+  gfx::Size GetPartSize(Part part,
+                        State state,
+                        const ExtraParams& extra) const override;
+  void Paint(SkCanvas* canvas,
+             Part part,
+             State state,
+             const gfx::Rect& rect,
+             const ExtraParams& extra) const override;
+  SkColor GetSystemColor(ColorId color_id) const override;
+  void PaintMenuPopupBackground(
       SkCanvas* canvas,
       const gfx::Size& size,
       const MenuBackgroundExtraParams& menu_background) const override;
-  virtual void PaintMenuItemBackground(
+  void PaintMenuItemBackground(
       SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
@@ -43,7 +43,7 @@ class NativeThemeGtk2 : public ui::NativeThemeBase {
 
  private:
   NativeThemeGtk2();
-  virtual ~NativeThemeGtk2();
+  ~NativeThemeGtk2() override;
 
   // Implementation of GetSystemColor.
   GdkColor GetSystemGdkColor(ColorId color_id) const;
diff --git a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
index b1b4f51..ce39b5a 100644
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
@@ -37,16 +37,16 @@ class PrintDialogGtk2
       PrintingContextLinux* context);
 
   // printing::PrintDialogGtkInterface implementation.
-  virtual void UseDefaultSettings() override;
-  virtual bool UpdateSettings(printing::PrintSettings* settings) override;
-  virtual void ShowDialog(
+  void UseDefaultSettings() override;
+  bool UpdateSettings(printing::PrintSettings* settings) override;
+  void ShowDialog(
       gfx::NativeView parent_view,
       bool has_selection,
       const PrintingContextLinux::PrintSettingsCallback& callback) override;
-  virtual void PrintDocument(const printing::MetafilePlayer& metafile,
-                             const base::string16& document_name) override;
-  virtual void AddRefToDialog() override;
-  virtual void ReleaseDialog() override;
+  void PrintDocument(const printing::MetafilePlayer& metafile,
+                     const base::string16& document_name) override;
+  void AddRefToDialog() override;
+  void ReleaseDialog() override;
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
@@ -54,7 +54,7 @@ class PrintDialogGtk2
   friend class base::DeleteHelper<PrintDialogGtk2>;
 
   explicit PrintDialogGtk2(PrintingContextLinux* context);
-  virtual ~PrintDialogGtk2();
+  ~PrintDialogGtk2() override;
 
   // Handles dialog response.
   CHROMEGTK_CALLBACK_1(PrintDialogGtk2, void, OnResponse, int);
@@ -73,7 +73,7 @@ class PrintDialogGtk2
   void InitPrintSettings(printing::PrintSettings* settings);
 
   // aura::WindowObserver implementation.
-  virtual void OnWindowDestroying(aura::Window* window) override;
+  void OnWindowDestroying(aura::Window* window) override;
 
   // Printing dialog callback.
   PrintingContextLinux::PrintSettingsCallback callback_;
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
index dd1bdc9..801bfee 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
@@ -39,12 +39,12 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
   static bool CheckKDEDialogWorksOnUIThread();
 
   // BaseShellDialog implementation.
-  virtual void ListenerDestroyed() override;
+  void ListenerDestroyed() override;
 
  protected:
   explicit SelectFileDialogImpl(Listener* listener,
                                 ui::SelectFilePolicy* policy);
-  virtual ~SelectFileDialogImpl();
+  ~SelectFileDialogImpl() override;
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
index 7f0bf79..7a9d112 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
@@ -53,28 +53,27 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
                                    ui::SelectFilePolicy* policy);
 
  protected:
-  virtual ~SelectFileDialogImplGTK();
+  ~SelectFileDialogImplGTK() override;
 
   // BaseShellDialog implementation:
-  virtual bool IsRunning(gfx::NativeWindow parent_window) const override;
+  bool IsRunning(gfx::NativeWindow parent_window) const override;
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
-  virtual void SelectFileImpl(
-      Type type,
-      const base::string16& title,
-      const base::FilePath& default_path,
-      const FileTypeInfo* file_types,
-      int file_type_index,
-      const base::FilePath::StringType& default_extension,
-      gfx::NativeWindow owning_window,
-      void* params) override;
+  void SelectFileImpl(Type type,
+                      const base::string16& title,
+                      const base::FilePath& default_path,
+                      const FileTypeInfo* file_types,
+                      int file_type_index,
+                      const base::FilePath::StringType& default_extension,
+                      gfx::NativeWindow owning_window,
+                      void* params) override;
 
  private:
-  virtual bool HasMultipleFileTypeChoicesImpl() override;
+  bool HasMultipleFileTypeChoicesImpl() override;
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) override;
+  void OnWindowDestroying(aura::Window* window) override;
 
   // Add the filters from |file_types_| to |chooser|.
   void AddFilters(GtkFileChooser* chooser);
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
index ac6e91a..6a83451 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
@@ -51,25 +51,24 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
                           base::nix::DesktopEnvironment desktop);
 
  protected:
-  virtual ~SelectFileDialogImplKDE();
+  ~SelectFileDialogImplKDE() override;
 
   // BaseShellDialog implementation:
-  virtual bool IsRunning(gfx::NativeWindow parent_window) const override;
+  bool IsRunning(gfx::NativeWindow parent_window) const override;
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
-  virtual void SelectFileImpl(
-      Type type,
-      const base::string16& title,
-      const base::FilePath& default_path,
-      const FileTypeInfo* file_types,
-      int file_type_index,
-      const base::FilePath::StringType& default_extension,
-      gfx::NativeWindow owning_window,
-      void* params) override;
+  void SelectFileImpl(Type type,
+                      const base::string16& title,
+                      const base::FilePath& default_path,
+                      const FileTypeInfo* file_types,
+                      int file_type_index,
+                      const base::FilePath::StringType& default_extension,
+                      gfx::NativeWindow owning_window,
+                      void* params) override;
 
  private:
-  virtual bool HasMultipleFileTypeChoicesImpl() override;
+  bool HasMultipleFileTypeChoicesImpl() override;
 
   struct KDialogParams {
     KDialogParams(const std::string& type, const std::string& title,
diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
index f64b66a..8f23056 100644
--- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
@@ -28,14 +28,13 @@ class X11InputMethodContextImplGtk2 : public ui::LinuxInputMethodContext {
  public:
   explicit X11InputMethodContextImplGtk2(
       ui::LinuxInputMethodContextDelegate* delegate);
-  virtual ~X11InputMethodContextImplGtk2();
+  ~X11InputMethodContextImplGtk2() override;
 
   // Overriden from ui::LinuxInputMethodContext
-  virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;
-  virtual void Reset() override;
-  virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type)
-      override;
-  virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
+  bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;
+  void Reset() override;
+  void OnTextInputTypeChanged(ui::TextInputType text_input_type) override;
+  void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
 
  private:
   // Resets the cache of X modifier keycodes.
diff --git a/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
index 5a6d195..580e8f5 100644
--- a/chrome/browser/ui/location_bar/location_bar_browsertest.cc
+++ b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
@@ -43,7 +43,7 @@ const char kManifestSource[] =
 class LocationBarBrowserTest : public ExtensionBrowserTest {
  public:
   LocationBarBrowserTest() {}
-  virtual ~LocationBarBrowserTest() {}
+  ~LocationBarBrowserTest() override {}
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override;
@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(LocationBarBrowserTest,
 class LocationBarBrowserTestWithRedesign : public LocationBarBrowserTest {
  public:
   LocationBarBrowserTestWithRedesign() {}
-  virtual ~LocationBarBrowserTestWithRedesign() {}
+  ~LocationBarBrowserTestWithRedesign() override {}
 
  private:
   void SetUpCommandLine(base::CommandLine* command_line) override;
diff --git a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
index 5f63c3b..12a1794 100644
--- a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
+++ b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
@@ -52,7 +52,7 @@ class OriginChipInfoTest : public ChromeRenderViewHostTestHarness,
     EXPECT_EQ(expect_update, info_->Update(web_contents(), toolbar_model()));
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_CHROMEOS)
     test_user_manager_.reset(new chromeos::ScopedTestUserManager());
@@ -61,7 +61,7 @@ class OriginChipInfoTest : public ChromeRenderViewHostTestHarness,
     info_.reset(new OriginChipInfo(this, profile()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     info_.reset();
     toolbar_model_.reset();
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
index a882ed3..423bc87 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc
@@ -12,7 +12,7 @@
 class OmniboxControllerTest : public testing::Test {
  protected:
   OmniboxControllerTest();
-  virtual ~OmniboxControllerTest();
+  ~OmniboxControllerTest() override;
 
   void CreateController();
   void AssertProviders(int expected_providers);
diff --git a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
index 85e860a..1d0657a 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 
 class OmniboxViewTest : public PlatformTest {
  public:
-  virtual void TearDown() override {
+  void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h
index 619a34e..6c1c2b9 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/base_panel_browser_test.h
@@ -40,7 +40,7 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
   };
 
   BasePanelBrowserTest();
-  virtual ~BasePanelBrowserTest();
+  ~BasePanelBrowserTest() override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
diff --git a/chrome/browser/ui/panels/panel_resize_browsertest.cc b/chrome/browser/ui/panels/panel_resize_browsertest.cc
index 2f3bab5..391ff5c 100644
--- a/chrome/browser/ui/panels/panel_resize_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_resize_browsertest.cc
@@ -15,8 +15,7 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest {
   PanelResizeBrowserTest() : BasePanelBrowserTest() {
   }
 
-  virtual ~PanelResizeBrowserTest() {
-  }
+  ~PanelResizeBrowserTest() override {}
 
   void SetUpOnMainThread() override {
     BasePanelBrowserTest::SetUpOnMainThread();
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
index b5ee97a..301d371 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
@@ -25,7 +25,7 @@ class ManagePasswordsBubbleModelTest : public testing::Test {
             content::WebContentsTester::CreateTestWebContents(&profile_,
                                                               NULL)) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create the test UIController here so that it's bound to
     // |test_web_contents_| and therefore accessible to the model.
     new ManagePasswordsUIControllerMock(test_web_contents_.get());
@@ -33,7 +33,7 @@ class ManagePasswordsBubbleModelTest : public testing::Test {
     model_.reset(new ManagePasswordsBubbleModel(test_web_contents_.get()));
   }
 
-  virtual void TearDown() override { model_.reset(); }
+  void TearDown() override { model_.reset(); }
 
   void PretendPasswordWaiting() {
     model_->set_state(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 9453b5b..1eb16c2 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -46,7 +46,7 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   ManagePasswordsUIControllerTest() {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     // Create the test UIController here so that it's bound to
diff --git a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
index 62722a2..115260e 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
@@ -52,8 +52,8 @@ class PasswordManagerPresenterTest : public testing::Test {
  protected:
   PasswordManagerPresenterTest() {}
 
-  virtual ~PasswordManagerPresenterTest() {}
-  virtual void SetUp() override {
+  ~PasswordManagerPresenterTest() override {}
+  void SetUp() override {
     PasswordStoreFactory::GetInstance()->SetTestingFactory(
         &profile_, MockPasswordStoreService::Build);
     mock_controller_.reset(new MockPasswordUIView(&profile_));
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
index 1eb9bd8..7707c58 100644
--- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
@@ -50,7 +50,7 @@ class InstantExtendedManualTest : public InProcessBrowserTest,
         new net::ScopedDefaultHostResolverProc(host_resolver_proc_.get()));
   }
 
-  virtual ~InstantExtendedManualTest() {
+  ~InstantExtendedManualTest() override {
     scoped_host_resolver_proc_.reset();
     host_resolver_proc_ = NULL;
   }
diff --git a/chrome/browser/ui/search/instant_page_unittest.cc b/chrome/browser/ui/search/instant_page_unittest.cc
index 2682621..63ea4e7 100644
--- a/chrome/browser/ui/search/instant_page_unittest.cc
+++ b/chrome/browser/ui/search/instant_page_unittest.cc
@@ -49,7 +49,7 @@ class FakePageDelegate : public InstantPage::Delegate {
 
 class InstantPageTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() override;
+  void SetUp() override;
 
   bool MessageWasSent(uint32 id) {
     return process()->sink().GetFirstMessageMatching(id) != NULL;
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index bd06fb9..8501ea4 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -165,7 +165,7 @@ class InstantSearchPrerendererTest : public InstantUnitTestBase {
   InstantSearchPrerendererTest() {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                        "Group1 strk:20"));
     InstantUnitTestBase::SetUp();
@@ -430,7 +430,7 @@ class ReuseInstantSearchBasePageTest : public InstantSearchPrerendererTest {
    ReuseInstantSearchBasePageTest() {}
 
   protected:
-   virtual void SetUp() override {
+   void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                        "Group1 strk:20"));
     InstantUnitTestBase::SetUp();
@@ -471,7 +471,7 @@ TEST_F(ReuseInstantSearchBasePageTest,
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 class TestUsePrerenderPage : public InstantSearchPrerendererTest {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Disable query extraction flag in field trials.
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch", "Group1 strk:20 query_extraction:0"));
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
index 4eeb088..8aeca4c 100644
--- a/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_policy_unittest.cc
@@ -17,7 +17,7 @@
 
 class SearchIPCRouterPolicyTest : public BrowserWithTestWindowTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     AddTab(browser(), GURL("chrome://blank"));
     SearchTabHelper::CreateForWebContents(web_contents());
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index 4c87804..2d33e1f 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -91,7 +91,7 @@ class SearchIPCRouterTest : public BrowserWithTestWindowTest {
  public:
   SearchIPCRouterTest() : field_trial_list_(NULL) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     AddTab(browser(), GURL("chrome://blank"));
     SearchTabHelper::CreateForWebContents(web_contents());
diff --git a/chrome/browser/ui/search/search_model_unittest.cc b/chrome/browser/ui/search/search_model_unittest.cc
index 2f4a8f6..646639e 100644
--- a/chrome/browser/ui/search/search_model_unittest.cc
+++ b/chrome/browser/ui/search/search_model_unittest.cc
@@ -66,8 +66,8 @@ void MockSearchModelObserver::VerifyNotificationCount(int expected_count) {
 
 class SearchModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   MockSearchModelObserver mock_observer;
   SearchModel* model;
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index 7ca1df7..4498737 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -73,7 +73,7 @@ class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
 
 class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     SearchTabHelper::CreateForWebContents(web_contents());
   }
@@ -314,7 +314,7 @@ TEST_F(SearchTabHelperTest, TitleIsSetForNTP) {
 
 class SearchTabHelperWindowTest : public BrowserWithTestWindowTest {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &TemplateURLServiceFactory::BuildInstanceFor);
@@ -401,10 +401,10 @@ TEST_F(SearchTabHelperWindowTest, OnProvisionalLoadFailDontRedirectNonNTP) {
 
 class SearchTabHelperPrerenderTest : public InstantUnitTestBase {
  public:
-  virtual ~SearchTabHelperPrerenderTest() {}
+  ~SearchTabHelperPrerenderTest() override {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch",
         "Group1 espv:89 prefetch_results:1 "
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index e150836..1d44df9 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -45,7 +45,7 @@ class KeywordEditorControllerTest : public testing::Test,
         added_count_(0),
         removed_count_(0) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     if (simulate_load_failure_)
       util_.model()->OnWebDataServiceRequestDone(0, NULL);
     else
@@ -55,9 +55,7 @@ class KeywordEditorControllerTest : public testing::Test,
     controller_->table_model()->SetObserver(this);
   }
 
-  virtual void TearDown() override {
-    controller_.reset();
-  }
+  void TearDown() override { controller_.reset(); }
 
   void OnModelChanged() override { model_changed_count_++; }
 
diff --git a/chrome/browser/ui/settings_window_manager_browsertest.cc b/chrome/browser/ui/settings_window_manager_browsertest.cc
index 4aa0c5c..9f384e3 100644
--- a/chrome/browser/ui/settings_window_manager_browsertest.cc
+++ b/chrome/browser/ui/settings_window_manager_browsertest.cc
@@ -55,7 +55,7 @@ class SettingsWindowManagerTest : public InProcessBrowserTest {
         test_profile_(NULL) {
     settings_manager_->AddObserver(&observer_);
   }
-  virtual ~SettingsWindowManagerTest() {
+  ~SettingsWindowManagerTest() override {
     settings_manager_->RemoveObserver(&observer_);
   }
 
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
index 221ff9d..ded91fb 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -19,7 +19,7 @@
 
 class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     static_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(&pref_service);
     chrome::RegisterLocalState(pref_service.registry());
@@ -29,7 +29,7 @@ class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
     BrowserWithTestWindowTest::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(NULL);
     BrowserWithTestWindowTest::TearDown();
   }
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index a677e28..b1ab8e8 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -218,8 +218,8 @@ class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
 
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
   // Sets up the sign-in manager for tests.  If |username| is
   // is not empty, the profile of the mock WebContents will be connected to
@@ -344,7 +344,7 @@ class OneClickSigninHelperIOTest : public OneClickSigninHelperTest {
  public:
   OneClickSigninHelperIOTest();
 
-  virtual void SetUp() override;
+  void SetUp() override;
 
   TestProfileIOData* CreateTestProfileIOData(Profile::ProfileType profile_type);
 
@@ -858,12 +858,12 @@ MockStarterWrapper::MockStarterWrapper(
 
 class OneClickSyncStarterWrapperTest : public testing::Test {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     TestingProfile::Builder builder;
     profile_ = builder.Build();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Let the SyncStarterWrapper delete itself.
     base::RunLoop().RunUntilIdle();
   }
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
index e39fe72..3de08681 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
@@ -115,7 +115,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
         sync_observer_(NULL),
         sync_observer_destroyed_(true) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     web_contents_observer_.reset(new MockWebContentsObserver(web_contents()));
     sync_service_ =
@@ -124,7 +124,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
                 profile(), OneClickTestProfileSyncService::Build));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Verify that the |sync_observer_| unregistered as an observer from the
     // sync service and freed its memory.
     EXPECT_TRUE(sync_observer_destroyed_);
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
index 9a0895d..6d05b0a 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
@@ -30,7 +30,7 @@ class OneClickSigninSyncStarterTest : public ChromeRenderViewHostTestHarness {
         succeeded_count_(0) {}
 
   // ChromeRenderViewHostTestHarness:
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     // Disable sync to simplify the creation of a OneClickSigninSyncStarter.
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 7eca802..5a37889 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -123,7 +123,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create the profile.
     TestingProfile::Builder builder;
     user_prefs_ = new TestingPrefStoreWithCustomReadError;
@@ -153,7 +153,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
 #endif
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // TestExtensionSystem uses DeleteSoon, so we need to delete the profile
     // and then run the message queue to clean up.
     profile_.reset();
diff --git a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
index cbf6f54..15673d6 100644
--- a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
+++ b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
@@ -19,7 +19,7 @@ class SyncPromoUITest : public testing::Test {
   SyncPromoUITest() {}
 
   // testing::Test:
-  virtual void SetUp() override {
+  void SetUp() override {
     testing::Test::SetUp();
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
diff --git a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
index 7254d1b5e..892b49a 100644
--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
@@ -20,7 +20,7 @@ class BrowserActionTestUtil;
 class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
  protected:
   BrowserActionsBarBrowserTest();
-  virtual ~BrowserActionsBarBrowserTest();
+  ~BrowserActionsBarBrowserTest() override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 8a3ad22..241ddcc 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -142,10 +142,10 @@ class ToolbarModelTest : public BrowserWithTestWindowTest {
   ToolbarModelTest(Browser::Type browser_type,
                    chrome::HostDesktopType host_desktop_type,
                    bool hosted_app);
-  virtual ~ToolbarModelTest();
+  ~ToolbarModelTest() override;
 
   // BrowserWithTestWindowTest:
-  virtual void SetUp() override;
+  void SetUp() override;
 
  protected:
   void EnableOriginChipFieldTrial();
@@ -234,7 +234,7 @@ void ToolbarModelTest::NavigateAndCheckText(
 class PopupToolbarModelTest : public ToolbarModelTest {
  public:
   PopupToolbarModelTest();
-  virtual ~PopupToolbarModelTest();
+  ~PopupToolbarModelTest() override;
 
   DISALLOW_COPY_AND_ASSIGN(PopupToolbarModelTest);
 };
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
index 8f507a8..dd08822 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc
@@ -61,7 +61,7 @@ class WrenchMenuModelTest : public BrowserWithTestWindowTest,
   }
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     prefs_.reset(new TestingPrefServiceSimple());
     chrome::RegisterLocalState(prefs_->registry());
 
@@ -70,7 +70,7 @@ class WrenchMenuModelTest : public BrowserWithTestWindowTest,
     BrowserWithTestWindowTest::SetUp();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     BrowserWithTestWindowTest::TearDown();
     testing_io_thread_state_.reset();
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
index 931a7e0..efa8e7f 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
@@ -64,9 +64,9 @@ class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
                                     GURL("http://www.google.com/some/url")),
         iframe_request_other_domain_("iframe",
                                      GURL("http://www.youtube.com")) {}
-  virtual ~PermissionBubbleManagerTest() {}
+  ~PermissionBubbleManagerTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     SetContents(CreateTestWebContents());
     NavigateAndCommit(GURL("http://www.google.com"));
@@ -74,7 +74,7 @@ class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
     manager_.reset(new PermissionBubbleManager(web_contents()));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     manager_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
   }
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index c4d4da0..4e67c9f 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -73,10 +73,9 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
   WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {}
 
-  virtual ~WebsiteSettingsTest() {
-  }
+  ~WebsiteSettingsTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     // Setup stub SSLStatus.
     ssl_.security_style = content::SECURITY_STYLE_UNAUTHENTICATED;
@@ -103,7 +102,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
     mock_ui_.reset(new MockWebsiteSettingsUI());
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     ASSERT_TRUE(website_settings_.get())
         << "No WebsiteSettings instance created.";
     RenderViewHostTestHarness::TearDown();
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
index d942481..a1ac251 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
@@ -16,11 +16,11 @@ class WaitableEvent;
 // for each test.
 class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
  public:
-  virtual ~WebUIBidiCheckerBrowserTest();
+  ~WebUIBidiCheckerBrowserTest() override;
 
   // testing::Test implementation.
-  virtual void SetUp() override;
-  virtual void TearDown() override;
+  void SetUp() override;
+  void TearDown() override;
 
  protected:
   WebUIBidiCheckerBrowserTest();
diff --git a/chrome/browser/ui/webui/certificate_viewer_ui.h b/chrome/browser/ui/webui/certificate_viewer_ui.h
index deb825c..3bad0ca 100644
--- a/chrome/browser/ui/webui/certificate_viewer_ui.h
+++ b/chrome/browser/ui/webui/certificate_viewer_ui.h
@@ -12,7 +12,7 @@
 class CertificateViewerModalDialogUI : public ui::WebDialogUI {
  public:
   explicit CertificateViewerModalDialogUI(content::WebUI* web_ui);
-  virtual ~CertificateViewerModalDialogUI();
+  ~CertificateViewerModalDialogUI() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerModalDialogUI);
@@ -22,7 +22,7 @@ class CertificateViewerModalDialogUI : public ui::WebDialogUI {
 class CertificateViewerUI : public ConstrainedWebDialogUI {
  public:
   explicit CertificateViewerUI(content::WebUI* web_ui);
-  virtual ~CertificateViewerUI();
+  ~CertificateViewerUI() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerUI);
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h
index 330b0eb..0a0531a 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.h
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.h
@@ -32,7 +32,7 @@ class CertificateViewerModalDialog : public ui::WebDialogDelegate {
   // viewer.
   explicit CertificateViewerModalDialog(
       net::X509Certificate* cert);
-  virtual ~CertificateViewerModalDialog();
+  ~CertificateViewerModalDialog() override;
 
   virtual void Show(content::WebContents* web_contents,
                     gfx::NativeWindow parent);
@@ -42,20 +42,19 @@ class CertificateViewerModalDialog : public ui::WebDialogDelegate {
 
  protected:
   // Overridden from ui::WebDialogDelegate:
-  virtual ui::ModalType GetDialogModalType() const override;
-  virtual base::string16 GetDialogTitle() const override;
-  virtual GURL GetDialogContentURL() const override;
-  virtual void GetWebUIMessageHandlers(
+  ui::ModalType GetDialogModalType() const override;
+  base::string16 GetDialogTitle() const override;
+  GURL GetDialogContentURL() const override;
+  void GetWebUIMessageHandlers(
       std::vector<content::WebUIMessageHandler*>* handlers) const override;
-  virtual void GetDialogSize(gfx::Size* size) const override;
-  virtual std::string GetDialogArgs() const override;
-  virtual void OnDialogShown(
-      content::WebUI* webui,
-      content::RenderViewHost* render_view_host) override;
-  virtual void OnDialogClosed(const std::string& json_retval) override;
-  virtual void OnCloseContents(
-      content::WebContents* source, bool* out_close_dialog) override;
-  virtual bool ShouldShowDialogTitle() const override;
+  void GetDialogSize(gfx::Size* size) const override;
+  std::string GetDialogArgs() const override;
+  void OnDialogShown(content::WebUI* webui,
+                     content::RenderViewHost* render_view_host) override;
+  void OnDialogClosed(const std::string& json_retval) override;
+  void OnCloseContents(content::WebContents* source,
+                       bool* out_close_dialog) override;
+  bool ShouldShowDialogTitle() const override;
 
   // The certificate being viewed.
   scoped_refptr<net::X509Certificate> cert_;
@@ -79,18 +78,18 @@ class CertificateViewerDialog : public CertificateViewerModalDialog {
   // to the certificate pointer is added for the lifetime of the certificate
   // viewer.
   explicit CertificateViewerDialog(net::X509Certificate* cert);
-  virtual ~CertificateViewerDialog();
+  ~CertificateViewerDialog() override;
 
   // CertificateViewerModalDialog overrides.
-  virtual void Show(content::WebContents* web_contents,
-                    gfx::NativeWindow parent) override;
-  virtual web_modal::NativeWebContentsModalDialog
-  GetNativeWebContentsModalDialog() override;
+  void Show(content::WebContents* web_contents,
+            gfx::NativeWindow parent) override;
+  web_modal::NativeWebContentsModalDialog GetNativeWebContentsModalDialog()
+      override;
 
  protected:
   // Overridden from ui::WebDialogDelegate:
-  virtual GURL GetDialogContentURL() const override;
-  virtual ui::ModalType GetDialogModalType() const override;
+  GURL GetDialogContentURL() const override;
+  ui::ModalType GetDialogModalType() const override;
 
  private:
   ConstrainedWebDialogDelegate* dialog_;
@@ -104,10 +103,10 @@ class CertificateViewerDialogHandler : public content::WebUIMessageHandler {
  public:
   CertificateViewerDialogHandler(CertificateViewerModalDialog* dialog,
                                  net::X509Certificate* cert);
-  virtual ~CertificateViewerDialogHandler();
+  ~CertificateViewerDialogHandler() override;
 
   // Overridden from WebUIMessageHandler
-  virtual void RegisterMessages() override;
+  void RegisterMessages() override;
 
  private:
   // Brings up the export certificate dialog for the chosen certificate in the
diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
index 438e30a..415c66d 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc
@@ -116,7 +116,7 @@ class DownloadsDOMHandlerTest : public InProcessBrowserTest {
  public:
   DownloadsDOMHandlerTest() {}
 
-  virtual ~DownloadsDOMHandlerTest() {}
+  ~DownloadsDOMHandlerTest() override {}
 
   void SetUpOnMainThread() override {
     mock_handler_.reset(new MockDownloadsDOMHandler(download_manager()));
diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.h b/chrome/browser/ui/webui/downloads_ui_browsertest.h
index 7b02787..58e61817 100644
--- a/chrome/browser/ui/webui/downloads_ui_browsertest.h
+++ b/chrome/browser/ui/webui/downloads_ui_browsertest.h
@@ -11,7 +11,7 @@
 class DownloadsUIBrowserTest : public WebUIBrowserTest {
  public:
   DownloadsUIBrowserTest();
-  virtual ~DownloadsUIBrowserTest();
+  ~DownloadsUIBrowserTest() override;
 
  protected:
   // Sets the pref to allow or prohibit deleting history entries.
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
index 6da8360..92a8096 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
+++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h
@@ -15,7 +15,7 @@ class Profile;
 class ExtensionSettingsUIBrowserTest : public WebUIBrowserTest {
  public:
   ExtensionSettingsUIBrowserTest();
-  virtual ~ExtensionSettingsUIBrowserTest();
+  ~ExtensionSettingsUIBrowserTest() override;
 
  protected:
   // Get the profile to use.
diff --git a/chrome/browser/ui/webui/gesture_config_ui.h b/chrome/browser/ui/webui/gesture_config_ui.h
index cfb8858..48e2433 100644
--- a/chrome/browser/ui/webui/gesture_config_ui.h
+++ b/chrome/browser/ui/webui/gesture_config_ui.h
@@ -16,7 +16,7 @@ class GestureConfigUI : public content::WebUIController {
  public:
   // Constructs a new GestureConfig for the specified |web_ui|.
   explicit GestureConfigUI(content::WebUI* web_ui);
-  virtual ~GestureConfigUI();
+  ~GestureConfigUI() override;
 
  private:
   // TODO(mohsen): Add a whitelist of preferences that are allowed to be set or
diff --git a/chrome/browser/ui/webui/help/version_updater_basic.h b/chrome/browser/ui/webui/help/version_updater_basic.h
index 7781827..fab6793 100644
--- a/chrome/browser/ui/webui/help/version_updater_basic.h
+++ b/chrome/browser/ui/webui/help/version_updater_basic.h
@@ -12,15 +12,15 @@
 class VersionUpdaterBasic : public VersionUpdater {
  public:
   // VersionUpdater implementation.
-  virtual void CheckForUpdate(const StatusCallback& callback) override;
-  virtual void RelaunchBrowser() const override;
+  void CheckForUpdate(const StatusCallback& callback) override;
+  void RelaunchBrowser() const override;
 
  protected:
   friend class VersionUpdater;
 
   // Clients must use VersionUpdater::Create().
   VersionUpdaterBasic() {}
-  virtual ~VersionUpdaterBasic() {}
+  ~VersionUpdaterBasic() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VersionUpdaterBasic);
diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
index d2abf18..c5cba66 100644
--- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
+++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h
@@ -13,7 +13,7 @@
 class IdentityInternalsUIBrowserTest : public WebUIBrowserTest {
  public:
   IdentityInternalsUIBrowserTest();
-  virtual ~IdentityInternalsUIBrowserTest();
+  ~IdentityInternalsUIBrowserTest() override;
 
  protected:
   void SetupTokenCache(int number_of_tokens);
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc
index c2eb941..f5379be 100644
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc
@@ -15,7 +15,7 @@
 class InterstitialUITest : public InProcessBrowserTest {
  public:
    InterstitialUITest() {}
-   virtual ~InterstitialUITest() {}
+   ~InterstitialUITest() override {}
 
  protected:
   void TestInterstitial(GURL url, const std::string& page_title) {
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
index dbdc655..6c54e6d 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
@@ -17,7 +17,7 @@ class ListValue;
 class NetInternalsTest : public WebUIBrowserTest {
  protected:
   NetInternalsTest();
-  virtual ~NetInternalsTest();
+  ~NetInternalsTest() override;
 
  private:
   class MessageHandler;
diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
index 75e5f32..363473d 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc
@@ -10,7 +10,7 @@
 
 class MostVisitedWebUITest : public WebUIBrowserTest {
  public:
-  virtual ~MostVisitedWebUITest() {}
+  ~MostVisitedWebUITest() override {}
 
   void SetUpInProcessBrowserTestFixture() override {
     WebUIBrowserTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index d534167..630d405 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -42,11 +42,9 @@ class NewTabUIBrowserTest : public InProcessBrowserTest {
     logging::SetLogMessageHandler(&HandleMessage);
   }
 
-  virtual ~NewTabUIBrowserTest() {
-    logging::SetLogMessageHandler(NULL);
-  }
+  ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(NULL); }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     InProcessBrowserTest::TearDown();
     ASSERT_FALSE(had_console_errors);
   }
diff --git a/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc b/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
index 1a14aaf..6e5daad 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_combiner_unittest.cc
@@ -214,13 +214,13 @@ class SuggestionsCombinerTest : public testing::Test {
   }
 
  private:
-  virtual void SetUp() {
+  void SetUp() override {
     profile_ = new TestingProfile();
     suggestions_handler_ = new SuggestionsHandler();
     combiner_ = new SuggestionsCombiner(suggestions_handler_, profile_);
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     delete combiner_;
     delete suggestions_handler_;
     delete profile_;
diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
index 5d1346e..f4bf8f6 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
@@ -29,7 +29,7 @@ using testing::_;
 class CertificateManagerBrowserTest : public options::OptionsUIBrowserTest {
  public:
   CertificateManagerBrowserTest() {}
-  virtual ~CertificateManagerBrowserTest() {}
+  ~CertificateManagerBrowserTest() override {}
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h
index dd4a1be..948c3bb 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.h
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h
@@ -28,21 +28,20 @@ class CertificateManagerHandler
       public ui::SelectFileDialog::Listener {
  public:
   explicit CertificateManagerHandler(bool show_certs_in_modal_dialog);
-  virtual ~CertificateManagerHandler();
+  ~CertificateManagerHandler() override;
 
   // OptionsPageUIHandler implementation.
-  virtual void GetLocalizedValues(
-      base::DictionaryValue* localized_strings) override;
-  virtual void RegisterMessages() override;
+  void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
+  void RegisterMessages() override;
 
   // CertificateManagerModel::Observer implementation.
-  virtual void CertificatesRefreshed() override;
+  void CertificatesRefreshed() override;
 
   // SelectFileDialog::Listener implementation.
-  virtual void FileSelected(const base::FilePath& path,
-                            int index,
-                            void* params) override;
-  virtual void FileSelectionCanceled(void* params) override;
+  void FileSelected(const base::FilePath& path,
+                    int index,
+                    void* params) override;
+  void FileSelectionCanceled(void* params) override;
 
  private:
   // View certificate.
diff --git a/chrome/browser/ui/webui/options/options_browsertest.h b/chrome/browser/ui/webui/options/options_browsertest.h
index 638a57b..9dd0aec 100644
--- a/chrome/browser/ui/webui/options/options_browsertest.h
+++ b/chrome/browser/ui/webui/options/options_browsertest.h
@@ -16,7 +16,7 @@ class OptionsBrowserTest : public WebUIBrowserTest,
                            public content::WebUIMessageHandler {
  public:
   OptionsBrowserTest();
-  virtual ~OptionsBrowserTest();
+  ~OptionsBrowserTest() override;
 
  protected:
   // Clears the preference at the given |path|.
diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
index e61267c..5eadfab 100644
--- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
@@ -18,7 +18,7 @@
 class PasswordManagerInternalsWebUIBrowserTest : public WebUIBrowserTest {
  public:
   PasswordManagerInternalsWebUIBrowserTest();
-  virtual ~PasswordManagerInternalsWebUIBrowserTest();
+  ~PasswordManagerInternalsWebUIBrowserTest() override;
 
   void SetUpOnMainThread() override;
 
diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc
index 85f53a4..10aa48d 100644
--- a/chrome/browser/ui/webui/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc
@@ -82,7 +82,7 @@ std::vector<std::string> PopulateExpectedPolicy(
 class PolicyUITest : public InProcessBrowserTest {
  public:
   PolicyUITest();
-  virtual ~PolicyUITest();
+  ~PolicyUITest() override;
 
  protected:
   // InProcessBrowserTest implementation.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
index ed753c9..85b80f7 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc
@@ -43,10 +43,10 @@ bool IsShowingWebContentsModalDialog(WebContents* tab) {
 class PrintPreviewUIUnitTest : public PrintPreviewTest {
  public:
   PrintPreviewUIUnitTest();
-  virtual ~PrintPreviewUIUnitTest();
+  ~PrintPreviewUIUnitTest() override;
 
  protected:
-  virtual void SetUp() override;
+  void SetUp() override;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIUnitTest);
 };
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 116475d..bc0e5ba 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -179,7 +179,7 @@ class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest {
   }
 
  private:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
     // EmbeddedTestServer spawns a thread to initialize socket.
diff --git a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
index beb542e..3568802 100644
--- a/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
+++ b/chrome/browser/ui/webui/signin/login_ui_service_unittest.cc
@@ -46,7 +46,7 @@ class TestObserver : public LoginUIService::Observer {
 class LoginUIServiceTest : public testing::Test {
  public:
   LoginUIServiceTest() : service_(NULL) { }
-  virtual ~LoginUIServiceTest() { }
+  ~LoginUIServiceTest() override {}
 
  protected:
   LoginUIService service_;
diff --git a/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc b/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
index 1306d6e..06629e4 100644
--- a/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
@@ -22,7 +22,7 @@ class UserManagerUIBrowserTest : public InProcessBrowserTest,
   UserManagerUIBrowserTest() {}
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     InProcessBrowserTest::SetUp();
     DCHECK(switches::IsNewAvatarMenu());
   }
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index ffede4b..432de3e 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -260,7 +260,7 @@ class TestingSyncSetupHandler : public SyncSetupHandler {
 class SyncSetupHandlerTest : public testing::Test {
  public:
   SyncSetupHandlerTest() : error_(GoogleServiceAuthError::NONE) {}
-  virtual void SetUp() override {
+  void SetUp() override {
     error_ = GoogleServiceAuthError::AuthErrorNone();
 
     TestingProfile::Builder builder;
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc
index f79824e..0163c34 100644
--- a/chrome/browser/ui/webui/theme_source_unittest.cc
+++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -32,14 +32,14 @@ class WebUISourcesTest : public testing::Test {
   size_t result_data_size_;
 
  private:
-  virtual void SetUp() {
+  void SetUp() override {
     profile_.reset(new TestingProfile());
     theme_source_.reset(new ThemeSource(profile_.get()));
     callback_ = base::Bind(&WebUISourcesTest::SendResponse,
                            base::Unretained(this));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     theme_source_.reset();
     profile_.reset();
   }
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index 0cce027..31a4d8a 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -46,12 +46,12 @@ class TestWebContentsDelegate : public WebDialogWebContentsDelegate {
 
 class WebDialogWebContentsDelegateTest : public BrowserWithTestWindowTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     test_web_contents_delegate_.reset(new TestWebContentsDelegate(profile()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     test_web_contents_delegate_.reset(NULL);
     BrowserWithTestWindowTest::TearDown();
   }
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 517026a..908ad8c 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -25,9 +25,9 @@ namespace {
 class WindowSizerTest : public InProcessBrowserTest {
  public:
   WindowSizerTest() {}
-  virtual ~WindowSizerTest() {}
+  ~WindowSizerTest() override {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) override {
+  void SetUpCommandLine(CommandLine* command_line) override {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     // Make screens sufficiently wide to host 2 browsers side by side.
     command_line->AppendSwitchASCII("ash-host-window-bounds",
@@ -120,7 +120,7 @@ namespace {
 class WindowSizerContextMenuTest : public WindowSizerTest {
  public:
   WindowSizerContextMenuTest() {}
-  virtual ~WindowSizerContextMenuTest() {}
+  ~WindowSizerContextMenuTest() override {}
 
   static void Step1(gfx::Point release_point) {
     ui_controls::SendMouseEventsNotifyWhenDone(
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index 0e71ff9..780c9ed 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -38,26 +38,20 @@ class TestBrowserWindowAura : public TestBrowserWindow {
   explicit TestBrowserWindowAura(aura::Window* native_window)
       : native_window_(native_window) {
   }
-  virtual ~TestBrowserWindowAura() {}
+  ~TestBrowserWindowAura() override {}
 
   // TestBrowserWindow overrides:
-  virtual void Show() override {
+  void Show() override {
     native_window_->Show();
     Activate();
   }
-  virtual void Hide() override {
-    native_window_->Hide();
-  }
-  virtual void Activate() override {
+  void Hide() override { native_window_->Hide(); }
+  void Activate() override {
     aura::client::GetActivationClient(
         native_window_->GetRootWindow())->ActivateWindow(native_window_.get());
   }
-  virtual gfx::NativeWindow GetNativeWindow() override {
-    return native_window_.get();
-  }
-  virtual gfx::Rect GetBounds() const override {
-    return native_window_->bounds();
-  }
+  gfx::NativeWindow GetNativeWindow() override { return native_window_.get(); }
+  gfx::Rect GetBounds() const override { return native_window_->bounds(); }
 
   Browser* browser() { return browser_.get(); }
 
diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
index f90864f..1d468f9 100644
--- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -35,7 +35,7 @@ class TestZoomObserver : public ZoomObserver {
 
 class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() override {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     zoom_controller_.reset(new ZoomController(web_contents()));
     zoom_controller_->AddObserver(&zoom_observer_);
@@ -46,7 +46,7 @@ class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
         base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     zoom_controller_->RemoveObserver(&zoom_observer_);
     zoom_controller_.reset();
     ChromeRenderViewHostTestHarness::TearDown();