Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

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

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

100 files changed, 624 insertions, 624 deletions

diff --git a/chrome/test/base/browser_perf_tests_main.cc b/chrome/test/base/browser_perf_tests_main.cc
index 99fcdd4..3ba3ccf 100644
--- a/chrome/test/base/browser_perf_tests_main.cc
+++ b/chrome/test/base/browser_perf_tests_main.cc
@@ -7,7 +7,7 @@
 
 class ChromeBrowserTestSuiteRunner : public ChromeTestSuiteRunner {
  public:
-  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+  virtual int RunTestSuite(int argc, char** argv) override {
     return ChromeTestSuite(argc, argv).Run();
   }
 };
diff --git a/chrome/test/base/browser_tests_main.cc b/chrome/test/base/browser_tests_main.cc
index 7759a40..4d1958a 100644
--- a/chrome/test/base/browser_tests_main.cc
+++ b/chrome/test/base/browser_tests_main.cc
@@ -10,7 +10,7 @@
 
 class ChromeBrowserTestSuiteRunner : public ChromeTestSuiteRunner {
  public:
-  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+  virtual int RunTestSuite(int argc, char** argv) override {
     return ChromeTestSuite(argc, argv).Run();
   }
 };
diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index 404e94a..41c5984 100644
--- a/chrome/test/base/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -90,8 +90,8 @@ class BrowserWithTestWindowTest : public testing::Test {
 
   virtual ~BrowserWithTestWindowTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   BrowserWindow* window() const { return window_.get(); }
diff --git a/chrome/test/base/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc
index 2705fb1..a9cc24e 100644
--- a/chrome/test/base/chrome_process_util.cc
+++ b/chrome/test/base/chrome_process_util.cc
@@ -69,7 +69,7 @@ class ChildProcessFilter : public base::ProcessFilter {
   explicit ChildProcessFilter(const std::vector<base::ProcessId>& parent_pids)
       : parent_pids_(parent_pids.begin(), parent_pids.end()) {}
 
-  virtual bool Includes(const base::ProcessEntry& entry) const OVERRIDE {
+  virtual bool Includes(const base::ProcessEntry& entry) const override {
     return parent_pids_.find(entry.parent_pid()) != parent_pids_.end();
   }
 
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.h b/chrome/test/base/chrome_render_view_host_test_harness.h
index dd360fa..fbbaf08 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.h
+++ b/chrome/test/base/chrome_render_view_host_test_harness.h
@@ -28,10 +28,10 @@ class ChromeRenderViewHostTestHarness
 
  protected:
   // testing::Test
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   // content::RenderViewHostTestHarness.
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+  virtual content::BrowserContext* CreateBrowserContext() override;
 };
 
 #endif  // CHROME_TEST_BASE_CHROME_RENDER_VIEW_HOST_TEST_HARNESS_H_
diff --git a/chrome/test/base/chrome_render_view_test.h b/chrome/test/base/chrome_render_view_test.h
index 6ff32b6..c00cbb5 100644
--- a/chrome/test/base/chrome_render_view_test.h
+++ b/chrome/test/base/chrome_render_view_test.h
@@ -28,12 +28,12 @@ class ChromeRenderViewTest : public content::RenderViewTest {
 
  protected:
   // testing::Test
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
-  virtual content::ContentClient* CreateContentClient() OVERRIDE;
-  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
+  virtual content::ContentClient* CreateContentClient() override;
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
   virtual content::ContentRendererClient*
-      CreateContentRendererClient() OVERRIDE;
+      CreateContentRendererClient() override;
 
 #if defined(ENABLE_EXTENSIONS)
   scoped_ptr<extensions::DispatcherDelegate> extension_dispatcher_delegate_;
diff --git a/chrome/test/base/chrome_test_launcher.cc b/chrome/test/base/chrome_test_launcher.cc
index 524be28..dd31620 100644
--- a/chrome/test/base/chrome_test_launcher.cc
+++ b/chrome/test/base/chrome_test_launcher.cc
@@ -52,12 +52,12 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
       : runner_(runner) {}
   virtual ~ChromeTestLauncherDelegate() {}
 
-  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+  virtual int RunTestSuite(int argc, char** argv) override {
     return runner_->RunTestSuite(argc, argv);
   }
 
   virtual bool AdjustChildProcessCommandLine(
-      CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
+      CommandLine* command_line, const base::FilePath& temp_data_dir) override {
     CommandLine new_command_line(command_line->GetProgram());
     CommandLine::SwitchMap switches = command_line->GetSwitches();
 
@@ -79,11 +79,11 @@ class ChromeTestLauncherDelegate : public content::TestLauncherDelegate {
   }
 
  protected:
-  virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
+  virtual content::ContentMainDelegate* CreateContentMainDelegate() override {
     return new ChromeMainDelegate();
   }
 
-  virtual void AdjustDefaultParallelJobs(int* default_jobs) OVERRIDE {
+  virtual void AdjustDefaultParallelJobs(int* default_jobs) override {
 #if defined(OS_WIN)
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAshBrowserTests)) {
diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
index 7c24d76..9480957 100644
--- a/chrome/test/base/chrome_test_suite.h
+++ b/chrome/test/base/chrome_test_suite.h
@@ -20,8 +20,8 @@ class ChromeTestSuite : public content::ContentTestSuiteBase {
 
  protected:
   // base::TestSuite overrides:
-  virtual void Initialize() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
+  virtual void Initialize() override;
+  virtual void Shutdown() override;
 
   void SetBrowserDirectory(const base::FilePath& browser_dir) {
     browser_dir_ = browser_dir;
diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc
index 22f5188..2ea8d38 100644
--- a/chrome/test/base/chrome_unit_test_suite.cc
+++ b/chrome/test/base/chrome_unit_test_suite.cc
@@ -44,7 +44,7 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
   ChromeUnitTestSuiteInitializer() {}
   virtual ~ChromeUnitTestSuiteInitializer() {}
 
-  virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestStart(const testing::TestInfo& test_info) override {
     content_client_.reset(new ChromeContentClient);
     content::SetContentClient(content_client_.get());
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
@@ -58,7 +58,7 @@ class ChromeUnitTestSuiteInitializer : public testing::EmptyTestEventListener {
     TestingBrowserProcess::CreateInstance();
   }
 
-  virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+  virtual void OnTestEnd(const testing::TestInfo& test_info) override {
     // TODO(ios): Bring this back once ChromeContentBrowserClient is building.
 #if !defined(OS_IOS)
     browser_content_client_.reset();
diff --git a/chrome/test/base/chrome_unit_test_suite.h b/chrome/test/base/chrome_unit_test_suite.h
index 1c1ddbd..e020815 100644
--- a/chrome/test/base/chrome_unit_test_suite.h
+++ b/chrome/test/base/chrome_unit_test_suite.h
@@ -18,8 +18,8 @@ class ChromeUnitTestSuite : public ChromeTestSuite {
   virtual ~ChromeUnitTestSuite();
 
   // base::TestSuite overrides:
-  virtual void Initialize() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
+  virtual void Initialize() override;
+  virtual void Shutdown() override;
 
   // These methods allow unit tests which run in the browser_test binary, and so
   // which don't exercise the initialization in this test suite, to do basic
diff --git a/chrome/test/base/extension_load_waiter_one_shot.h b/chrome/test/base/extension_load_waiter_one_shot.h
index 1494c61..47d22d6 100644
--- a/chrome/test/base/extension_load_waiter_one_shot.h
+++ b/chrome/test/base/extension_load_waiter_one_shot.h
@@ -28,7 +28,7 @@ class ExtensionLoadWaiterOneShot : public content::NotificationObserver {
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Get the browser context associated with the loaded extension. Returns
   // NULL if |WaitForExtension| was not previously called.
diff --git a/chrome/test/base/find_in_page_observer.h b/chrome/test/base/find_in_page_observer.h
index d6eae3c..82e00f9 100644
--- a/chrome/test/base/find_in_page_observer.h
+++ b/chrome/test/base/find_in_page_observer.h
@@ -39,7 +39,7 @@ class FindInPageNotificationObserver : public content::NotificationObserver {
  private:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   content::NotificationRegistrar registrar_;
   // We will at some point (before final update) be notified of the ordinal and
diff --git a/chrome/test/base/history_index_restore_observer.h b/chrome/test/base/history_index_restore_observer.h
index 3f03377..c03a385 100644
--- a/chrome/test/base/history_index_restore_observer.h
+++ b/chrome/test/base/history_index_restore_observer.h
@@ -22,7 +22,7 @@ class HistoryIndexRestoreObserver
   bool succeeded() const { return succeeded_; }
 
   // RestoreCacheObserver implementation.
-  virtual void OnCacheRestoreFinished(bool success) OVERRIDE;
+  virtual void OnCacheRestoreFinished(bool success) override;
 
  private:
   base::Closure task_;
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index f78058c..4034d56 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -88,7 +88,7 @@ class SingleDesktopTestObserver : public chrome::BrowserListObserver,
   virtual ~SingleDesktopTestObserver();
 
   // chrome::BrowserListObserver:
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
+  virtual void OnBrowserAdded(Browser* browser) override;
 
  private:
   chrome::HostDesktopType allowed_desktop_;
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 34a1e51..e91a3e7 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -98,10 +98,10 @@ class InProcessBrowserTest : public content::BrowserTestBase {
 
   // Configures everything for an in process browser test, then invokes
   // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop.
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   // Restores state configured in SetUp.
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
  protected:
   // Returns the browser created by CreateBrowser.
@@ -123,7 +123,7 @@ class InProcessBrowserTest : public content::BrowserTestBase {
   virtual bool SetUpUserDataDirectory() WARN_UNUSED_RESULT;
 
   // BrowserTestBase:
-  virtual void RunTestOnMainThreadLoop() OVERRIDE;
+  virtual void RunTestOnMainThreadLoop() override;
 
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
diff --git a/chrome/test/base/in_process_browser_test_browsertest.cc b/chrome/test/base/in_process_browser_test_browsertest.cc
index 54f6cb4..1ecf532 100644
--- a/chrome/test/base/in_process_browser_test_browsertest.cc
+++ b/chrome/test/base/in_process_browser_test_browsertest.cc
@@ -41,7 +41,7 @@ class LoadFailObserver : public content::WebContentsObserver {
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
-      const base::string16& error_description) OVERRIDE {
+      const base::string16& error_description) override {
     failed_load_ = true;
     error_code_ = static_cast<net::Error>(error_code);
     validated_url_ = validated_url;
diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc
index f16f456..6f5b46c 100644
--- a/chrome/test/base/interactive_ui_tests_main.cc
+++ b/chrome/test/base/interactive_ui_tests_main.cc
@@ -30,7 +30,7 @@ class InteractiveUITestSuite : public ChromeTestSuite {
 
  protected:
   // ChromeTestSuite overrides:
-  virtual void Initialize() OVERRIDE {
+  virtual void Initialize() override {
     ChromeTestSuite::Initialize();
 
     // Only allow ui_controls to be used in interactive_ui_tests, since they
@@ -54,7 +54,7 @@ class InteractiveUITestSuite : public ChromeTestSuite {
 #endif
   }
 
-  virtual void Shutdown() OVERRIDE {
+  virtual void Shutdown() override {
 #if defined(OS_WIN)
     com_initializer_.reset();
 #endif
@@ -68,7 +68,7 @@ class InteractiveUITestSuite : public ChromeTestSuite {
 
 class InteractiveUITestSuiteRunner : public ChromeTestSuiteRunner {
  public:
-  virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
+  virtual int RunTestSuite(int argc, char** argv) override {
     return InteractiveUITestSuite(argc, argv).Run();
   }
 };
diff --git a/chrome/test/base/javascript_browser_test.h b/chrome/test/base/javascript_browser_test.h
index 7160e57..b5cdf78 100644
--- a/chrome/test/base/javascript_browser_test.h
+++ b/chrome/test/base/javascript_browser_test.h
@@ -31,7 +31,7 @@ class JavaScriptBrowserTest : public InProcessBrowserTest {
   virtual ~JavaScriptBrowserTest();
 
   // InProcessBrowserTest overrides.
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   // Builds a vector of strings of all added javascript libraries suitable for
   // execution by subclasses.
diff --git a/chrome/test/base/menu_model_test.h b/chrome/test/base/menu_model_test.h
index e474114..108f67b 100644
--- a/chrome/test/base/menu_model_test.h
+++ b/chrome/test/base/menu_model_test.h
@@ -23,12 +23,12 @@ class MenuModelTest {
    public:
     Delegate() : execute_count_(0), enable_count_(0) {}
 
-    virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-    virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+    virtual bool IsCommandIdChecked(int command_id) const override;
+    virtual bool IsCommandIdEnabled(int command_id) const override;
     virtual bool GetAcceleratorForCommandId(
         int command_id,
-        ui::Accelerator* accelerator) OVERRIDE;
-    virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+        ui::Accelerator* accelerator) override;
+    virtual void ExecuteCommand(int command_id, int event_flags) override;
 
     int execute_count_;
     mutable int enable_count_;
diff --git a/chrome/test/base/test_browser_window.cc b/chrome/test/base/test_browser_window.cc
index 0a159b1..e295b3b 100644
--- a/chrome/test/base/test_browser_window.cc
+++ b/chrome/test/base/test_browser_window.cc
@@ -28,7 +28,7 @@ class TestBrowserWindowOwner : public chrome::BrowserListObserver {
 
  private:
   // Overridden from BrowserListObserver:
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
+  virtual void OnBrowserRemoved(Browser* browser) override {
     if (browser->window() == window_.get())
       delete this;
   }
diff --git a/chrome/test/base/test_browser_window.h b/chrome/test/base/test_browser_window.h
index b9c746a..86874fe 100644
--- a/chrome/test/base/test_browser_window.h
+++ b/chrome/test/base/test_browser_window.h
@@ -29,133 +29,133 @@ class TestBrowserWindow : public BrowserWindow {
   virtual ~TestBrowserWindow();
 
   // BrowserWindow:
-  virtual void Show() OVERRIDE {}
-  virtual void ShowInactive() OVERRIDE {}
-  virtual void Hide() OVERRIDE {}
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE {}
-  virtual void Close() OVERRIDE {}
-  virtual void Activate() OVERRIDE {}
-  virtual void Deactivate() OVERRIDE {}
-  virtual bool IsActive() const OVERRIDE;
-  virtual void FlashFrame(bool flash) OVERRIDE {}
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
-  virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE {}
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
-  virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
-  virtual StatusBubble* GetStatusBubble() OVERRIDE;
-  virtual void UpdateTitleBar() OVERRIDE {}
+  virtual void Show() override {}
+  virtual void ShowInactive() override {}
+  virtual void Hide() override {}
+  virtual void SetBounds(const gfx::Rect& bounds) override {}
+  virtual void Close() override {}
+  virtual void Activate() override {}
+  virtual void Deactivate() override {}
+  virtual bool IsActive() const override;
+  virtual void FlashFrame(bool flash) override {}
+  virtual bool IsAlwaysOnTop() const override;
+  virtual void SetAlwaysOnTop(bool always_on_top) override {}
+  virtual gfx::NativeWindow GetNativeWindow() override;
+  virtual BrowserWindowTesting* GetBrowserWindowTesting() override;
+  virtual StatusBubble* GetStatusBubble() override;
+  virtual void UpdateTitleBar() override {}
   virtual void BookmarkBarStateChanged(
-      BookmarkBar::AnimateChangeType change_type) OVERRIDE {}
-  virtual void UpdateDevTools() OVERRIDE {}
-  virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE {}
-  virtual void SetStarredState(bool is_starred) OVERRIDE {}
-  virtual void SetTranslateIconToggled(bool is_lit) OVERRIDE {}
+      BookmarkBar::AnimateChangeType change_type) override {}
+  virtual void UpdateDevTools() override {}
+  virtual void UpdateLoadingAnimations(bool should_animate) override {}
+  virtual void SetStarredState(bool is_starred) override {}
+  virtual void SetTranslateIconToggled(bool is_lit) override {}
   virtual void OnActiveTabChanged(content::WebContents* old_contents,
                                   content::WebContents* new_contents,
                                   int index,
-                                  int reason) OVERRIDE {}
-  virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE {}
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
-  virtual gfx::Rect GetBounds() const OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual void Maximize() OVERRIDE {}
-  virtual void Minimize() OVERRIDE {}
-  virtual void Restore() OVERRIDE {}
+                                  int reason) override {}
+  virtual void ZoomChangedForActiveTab(bool can_show_bubble) override {}
+  virtual gfx::Rect GetRestoredBounds() const override;
+  virtual ui::WindowShowState GetRestoredState() const override;
+  virtual gfx::Rect GetBounds() const override;
+  virtual bool IsMaximized() const override;
+  virtual bool IsMinimized() const override;
+  virtual void Maximize() override {}
+  virtual void Minimize() override {}
+  virtual void Restore() override {}
   virtual void EnterFullscreen(
-      const GURL& url, FullscreenExitBubbleType type) OVERRIDE {}
-  virtual void ExitFullscreen() OVERRIDE {}
+      const GURL& url, FullscreenExitBubbleType type) override {}
+  virtual void ExitFullscreen() override {}
   virtual void UpdateFullscreenExitBubbleContent(
       const GURL& url,
-      FullscreenExitBubbleType bubble_type) OVERRIDE {}
-  virtual bool ShouldHideUIForFullscreen() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
+      FullscreenExitBubbleType bubble_type) override {}
+  virtual bool ShouldHideUIForFullscreen() const override;
+  virtual bool IsFullscreen() const override;
 #if defined(OS_WIN)
-  virtual void SetMetroSnapMode(bool enable) OVERRIDE {}
+  virtual void SetMetroSnapMode(bool enable) override {}
   virtual bool IsInMetroSnapMode() const;
 #endif
-  virtual bool IsFullscreenBubbleVisible() const OVERRIDE;
-  virtual LocationBar* GetLocationBar() const OVERRIDE;
-  virtual void SetFocusToLocationBar(bool select_all) OVERRIDE {}
-  virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE {}
-  virtual void UpdateToolbar(content::WebContents* contents) OVERRIDE {}
-  virtual void FocusToolbar() OVERRIDE {}
-  virtual void FocusAppMenu() OVERRIDE {}
-  virtual void FocusBookmarksToolbar() OVERRIDE {}
-  virtual void FocusInfobars() OVERRIDE {}
-  virtual void RotatePaneFocus(bool forwards) OVERRIDE {}
-  virtual void ShowAppMenu() OVERRIDE {}
+  virtual bool IsFullscreenBubbleVisible() const override;
+  virtual LocationBar* GetLocationBar() const override;
+  virtual void SetFocusToLocationBar(bool select_all) override {}
+  virtual void UpdateReloadStopState(bool is_loading, bool force) override {}
+  virtual void UpdateToolbar(content::WebContents* contents) override {}
+  virtual void FocusToolbar() override {}
+  virtual void FocusAppMenu() override {}
+  virtual void FocusBookmarksToolbar() override {}
+  virtual void FocusInfobars() override {}
+  virtual void RotatePaneFocus(bool forwards) override {}
+  virtual void ShowAppMenu() override {}
   virtual bool PreHandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event,
-      bool* is_keyboard_shortcut) OVERRIDE;
+      bool* is_keyboard_shortcut) override;
   virtual void HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE {}
+      const content::NativeWebKeyboardEvent& event) override {}
 
-  virtual bool IsBookmarkBarVisible() const OVERRIDE;
-  virtual bool IsBookmarkBarAnimating() const OVERRIDE;
-  virtual bool IsTabStripEditable() const OVERRIDE;
-  virtual bool IsToolbarVisible() const OVERRIDE;
-  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
+  virtual bool IsBookmarkBarVisible() const override;
+  virtual bool IsBookmarkBarAnimating() const override;
+  virtual bool IsTabStripEditable() const override;
+  virtual bool IsToolbarVisible() const override;
+  virtual gfx::Rect GetRootWindowResizerRect() const override;
   virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
-                                        Profile* profile) OVERRIDE {}
-  virtual void ShowUpdateChromeDialog() OVERRIDE {}
+                                        Profile* profile) override {}
+  virtual void ShowUpdateChromeDialog() override {}
   virtual void ShowBookmarkBubble(const GURL& url,
-                                  bool already_bookmarked) OVERRIDE {}
+                                  bool already_bookmarked) override {}
   virtual void ShowBookmarkAppBubble(
       const WebApplicationInfo& web_app_info,
-      const std::string& extension_id) OVERRIDE {}
+      const std::string& extension_id) override {}
   virtual void ShowTranslateBubble(
       content::WebContents* contents,
       translate::TranslateStep step,
       translate::TranslateErrors::Type error_type,
-      bool is_user_gesture) OVERRIDE {}
+      bool is_user_gesture) override {}
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   virtual void ShowOneClickSigninBubble(
       OneClickSigninBubbleType type,
       const base::string16& email,
       const base::string16& error_message,
-      const StartSyncCallback& start_sync_callback) OVERRIDE {}
+      const StartSyncCallback& start_sync_callback) override {}
 #endif
-  virtual bool IsDownloadShelfVisible() const OVERRIDE;
-  virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
+  virtual bool IsDownloadShelfVisible() const override;
+  virtual DownloadShelf* GetDownloadShelf() override;
   virtual void ConfirmBrowserCloseWithPendingDownloads(
       int download_count,
       Browser::DownloadClosePreventionType dialog_type,
       bool app_modal,
-      const base::Callback<void(bool)>& callback) OVERRIDE {}
-  virtual void UserChangedTheme() OVERRIDE {}
-  virtual int GetExtraRenderViewHeight() const OVERRIDE;
-  virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE {}
+      const base::Callback<void(bool)>& callback) override {}
+  virtual void UserChangedTheme() override {}
+  virtual int GetExtraRenderViewHeight() const override;
+  virtual void WebContentsFocused(content::WebContents* contents) override {}
   virtual void ShowWebsiteSettings(Profile* profile,
                                    content::WebContents* web_contents,
                                    const GURL& url,
-                                   const content::SSLStatus& ssl) OVERRIDE {}
-  virtual void Cut() OVERRIDE {}
-  virtual void Copy() OVERRIDE {}
-  virtual void Paste() OVERRIDE {}
+                                   const content::SSLStatus& ssl) override {}
+  virtual void Cut() override {}
+  virtual void Copy() override {}
+  virtual void Paste() override {}
 #if defined(OS_MACOSX)
-  virtual void EnterFullscreenWithChrome() OVERRIDE {}
-  virtual bool IsFullscreenWithChrome() OVERRIDE;
-  virtual bool IsFullscreenWithoutChrome() OVERRIDE;
+  virtual void EnterFullscreenWithChrome() override {}
+  virtual bool IsFullscreenWithChrome() override;
+  virtual bool IsFullscreenWithoutChrome() override;
 #endif
 
   virtual WindowOpenDisposition GetDispositionForPopupBounds(
-      const gfx::Rect& bounds) OVERRIDE;
-  virtual FindBar* CreateFindBar() OVERRIDE;
+      const gfx::Rect& bounds) override;
+  virtual FindBar* CreateFindBar() override;
   virtual web_modal::WebContentsModalDialogHost*
-      GetWebContentsModalDialogHost() OVERRIDE;
+      GetWebContentsModalDialogHost() override;
   virtual void ShowAvatarBubble(content::WebContents* web_contents,
-                                const gfx::Rect& rect) OVERRIDE {}
+                                const gfx::Rect& rect) override {}
   virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
-      const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE {}
-  virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE;
+      const signin::ManageAccountsParams& manage_accounts_params) override {}
+  virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
   virtual void ExecuteExtensionCommand(
       const extensions::Extension* extension,
-      const extensions::Command& command) OVERRIDE;
+      const extensions::Command& command) override;
 
  protected:
-  virtual void DestroyBrowser() OVERRIDE {}
+  virtual void DestroyBrowser() override {}
 
  private:
   class TestLocationBar : public LocationBar {
@@ -164,27 +164,27 @@ class TestBrowserWindow : public BrowserWindow {
     virtual ~TestLocationBar() {}
 
     // LocationBar:
-    virtual void ShowFirstRunBubble() OVERRIDE {}
-    virtual GURL GetDestinationURL() const OVERRIDE;
-    virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
-    virtual ui::PageTransition GetPageTransition() const OVERRIDE;
-    virtual void AcceptInput() OVERRIDE {}
-    virtual void FocusLocation(bool select_all) OVERRIDE {}
-    virtual void FocusSearch() OVERRIDE {}
-    virtual void UpdateContentSettingsIcons() OVERRIDE {}
-    virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE {}
-    virtual void UpdatePageActions() OVERRIDE {}
-    virtual void InvalidatePageActions() OVERRIDE {}
-    virtual void UpdateBookmarkStarVisibility() OVERRIDE {}
+    virtual void ShowFirstRunBubble() override {}
+    virtual GURL GetDestinationURL() const override;
+    virtual WindowOpenDisposition GetWindowOpenDisposition() const override;
+    virtual ui::PageTransition GetPageTransition() const override;
+    virtual void AcceptInput() override {}
+    virtual void FocusLocation(bool select_all) override {}
+    virtual void FocusSearch() override {}
+    virtual void UpdateContentSettingsIcons() override {}
+    virtual void UpdateManagePasswordsIconAndBubble() override {}
+    virtual void UpdatePageActions() override {}
+    virtual void InvalidatePageActions() override {}
+    virtual void UpdateBookmarkStarVisibility() override {}
     virtual bool ShowPageActionPopup(const extensions::Extension* extension,
-                                     bool grant_active_tab) OVERRIDE;
-    virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE {}
-    virtual void UpdateGeneratedCreditCardView() OVERRIDE {}
-    virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE {}
-    virtual void Revert() OVERRIDE {}
-    virtual const OmniboxView* GetOmniboxView() const OVERRIDE;
-    virtual OmniboxView* GetOmniboxView() OVERRIDE;
-    virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
+                                     bool grant_active_tab) override;
+    virtual void UpdateOpenPDFInReaderPrompt() override {}
+    virtual void UpdateGeneratedCreditCardView() override {}
+    virtual void SaveStateToContents(content::WebContents* contents) override {}
+    virtual void Revert() override {}
+    virtual const OmniboxView* GetOmniboxView() const override;
+    virtual OmniboxView* GetOmniboxView() override;
+    virtual LocationBarTesting* GetLocationBarForTesting() override;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(TestLocationBar);
diff --git a/chrome/test/base/test_chrome_web_ui_controller_factory.h b/chrome/test/base/test_chrome_web_ui_controller_factory.h
index e33bae9..03f7bf7 100644
--- a/chrome/test/base/test_chrome_web_ui_controller_factory.h
+++ b/chrome/test/base/test_chrome_web_ui_controller_factory.h
@@ -43,9 +43,9 @@ class TestChromeWebUIControllerFactory : public ChromeWebUIControllerFactory {
   // ChromeWebUIFactory overrides.
   virtual content::WebUI::TypeID GetWebUIType(
       content::BrowserContext* browser_context,
-      const GURL& url) const OVERRIDE;
+      const GURL& url) const override;
   virtual content::WebUIController* CreateWebUIControllerForURL(
-      content::WebUI* web_ui, const GURL& url) const OVERRIDE;
+      content::WebUI* web_ui, const GURL& url) const override;
 
  private:
   // Return the WebUIProvider for the |url|'s host if it exists, otherwise NULL.
diff --git a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
index 4449b3f..15ef7f9 100644
--- a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
+++ b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc
@@ -43,7 +43,7 @@ const char kChromeTestChromeWebUIControllerFactory[] =
 // going to this handler.
 class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
  public:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     content::WebUIControllerFactory::UnregisterFactoryForTesting(
         ChromeWebUIControllerFactory::GetInstance());
     test_factory_.reset(new TestChromeWebUIControllerFactory);
@@ -52,7 +52,7 @@ class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest {
         GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_);
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     test_factory_->RemoveFactoryOverride(
         GURL(kChromeTestChromeWebUIControllerFactory).host());
     content::WebUIControllerFactory::UnregisterFactoryForTesting(
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
index bf39038..233fdb0 100644
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -58,74 +58,74 @@ class TestingBrowserProcess : public BrowserProcess {
   // Convenience method to get g_browser_process as a TestingBrowserProcess*.
   static TestingBrowserProcess* GetGlobal();
 
-  virtual void ResourceDispatcherHostCreated() OVERRIDE;
-  virtual void EndSession() OVERRIDE;
-  virtual MetricsServicesManager* GetMetricsServicesManager() OVERRIDE;
-  virtual metrics::MetricsService* metrics_service() OVERRIDE;
-  virtual rappor::RapporService* rappor_service() OVERRIDE;
-  virtual IOThread* io_thread() OVERRIDE;
-  virtual WatchDogThread* watchdog_thread() OVERRIDE;
-  virtual ProfileManager* profile_manager() OVERRIDE;
-  virtual PrefService* local_state() OVERRIDE;
-  virtual chrome_variations::VariationsService* variations_service() OVERRIDE;
-  virtual policy::BrowserPolicyConnector* browser_policy_connector() OVERRIDE;
-  virtual policy::PolicyService* policy_service() OVERRIDE;
-  virtual IconManager* icon_manager() OVERRIDE;
-  virtual GLStringManager* gl_string_manager() OVERRIDE;
-  virtual GpuModeManager* gpu_mode_manager() OVERRIDE;
-  virtual BackgroundModeManager* background_mode_manager() OVERRIDE;
+  virtual void ResourceDispatcherHostCreated() override;
+  virtual void EndSession() override;
+  virtual MetricsServicesManager* GetMetricsServicesManager() override;
+  virtual metrics::MetricsService* metrics_service() override;
+  virtual rappor::RapporService* rappor_service() override;
+  virtual IOThread* io_thread() override;
+  virtual WatchDogThread* watchdog_thread() override;
+  virtual ProfileManager* profile_manager() override;
+  virtual PrefService* local_state() override;
+  virtual chrome_variations::VariationsService* variations_service() override;
+  virtual policy::BrowserPolicyConnector* browser_policy_connector() override;
+  virtual policy::PolicyService* policy_service() override;
+  virtual IconManager* icon_manager() override;
+  virtual GLStringManager* gl_string_manager() override;
+  virtual GpuModeManager* gpu_mode_manager() override;
+  virtual BackgroundModeManager* background_mode_manager() override;
   virtual void set_background_mode_manager_for_test(
-      scoped_ptr<BackgroundModeManager> manager) OVERRIDE;
-  virtual StatusTray* status_tray() OVERRIDE;
-  virtual SafeBrowsingService* safe_browsing_service() OVERRIDE;
+      scoped_ptr<BackgroundModeManager> manager) override;
+  virtual StatusTray* status_tray() override;
+  virtual SafeBrowsingService* safe_browsing_service() override;
   virtual safe_browsing::ClientSideDetectionService*
-      safe_browsing_detection_service() OVERRIDE;
-  virtual net::URLRequestContextGetter* system_request_context() OVERRIDE;
-  virtual BrowserProcessPlatformPart* platform_part() OVERRIDE;
+      safe_browsing_detection_service() override;
+  virtual net::URLRequestContextGetter* system_request_context() override;
+  virtual BrowserProcessPlatformPart* platform_part() override;
 
   virtual extensions::EventRouterForwarder*
-      extension_event_router_forwarder() OVERRIDE;
-  virtual NotificationUIManager* notification_ui_manager() OVERRIDE;
-  virtual message_center::MessageCenter* message_center() OVERRIDE;
-  virtual IntranetRedirectDetector* intranet_redirect_detector() OVERRIDE;
+      extension_event_router_forwarder() override;
+  virtual NotificationUIManager* notification_ui_manager() override;
+  virtual message_center::MessageCenter* message_center() override;
+  virtual IntranetRedirectDetector* intranet_redirect_detector() override;
   virtual void CreateDevToolsHttpProtocolHandler(
       chrome::HostDesktopType host_desktop_type,
       const std::string& ip,
-      int port) OVERRIDE;
-  virtual unsigned int AddRefModule() OVERRIDE;
-  virtual unsigned int ReleaseModule() OVERRIDE;
-  virtual bool IsShuttingDown() OVERRIDE;
-  virtual printing::PrintJobManager* print_job_manager() OVERRIDE;
+      int port) override;
+  virtual unsigned int AddRefModule() override;
+  virtual unsigned int ReleaseModule() override;
+  virtual bool IsShuttingDown() override;
+  virtual printing::PrintJobManager* print_job_manager() override;
   virtual printing::PrintPreviewDialogController*
-      print_preview_dialog_controller() OVERRIDE;
+      print_preview_dialog_controller() override;
   virtual printing::BackgroundPrintingManager*
-      background_printing_manager() OVERRIDE;
-  virtual const std::string& GetApplicationLocale() OVERRIDE;
-  virtual void SetApplicationLocale(const std::string& app_locale) OVERRIDE;
-  virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
-  virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
+      background_printing_manager() override;
+  virtual const std::string& GetApplicationLocale() override;
+  virtual void SetApplicationLocale(const std::string& app_locale) override;
+  virtual DownloadStatusUpdater* download_status_updater() override;
+  virtual DownloadRequestLimiter* download_request_limiter() override;
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-  virtual void StartAutoupdateTimer() OVERRIDE {}
+  virtual void StartAutoupdateTimer() override {}
 #endif
 
-  virtual ChromeNetLog* net_log() OVERRIDE;
-  virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
+  virtual ChromeNetLog* net_log() override;
+  virtual prerender::PrerenderTracker* prerender_tracker() override;
   virtual component_updater::ComponentUpdateService*
-      component_updater() OVERRIDE;
-  virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
+      component_updater() override;
+  virtual CRLSetFetcher* crl_set_fetcher() override;
   virtual component_updater::PnaclComponentInstaller*
-      pnacl_component_installer() OVERRIDE;
-  virtual MediaFileSystemRegistry* media_file_system_registry() OVERRIDE;
-  virtual bool created_local_state() const OVERRIDE;
+      pnacl_component_installer() override;
+  virtual MediaFileSystemRegistry* media_file_system_registry() override;
+  virtual bool created_local_state() const override;
 
 #if defined(ENABLE_WEBRTC)
-  virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
+  virtual WebRtcLogUploader* webrtc_log_uploader() override;
 #endif
 
-  virtual network_time::NetworkTimeTracker* network_time_tracker() OVERRIDE;
+  virtual network_time::NetworkTimeTracker* network_time_tracker() override;
 
-  virtual gcm::GCMDriver* gcm_driver() OVERRIDE;
+  virtual gcm::GCMDriver* gcm_driver() override;
 
   // Set the local state for tests. Consumer is responsible for cleaning it up
   // afterwards (using ScopedTestingLocalState, for example).
diff --git a/chrome/test/base/testing_browser_process_platform_part.h b/chrome/test/base/testing_browser_process_platform_part.h
index 60d74c7..dd9ecb6 100644
--- a/chrome/test/base/testing_browser_process_platform_part.h
+++ b/chrome/test/base/testing_browser_process_platform_part.h
@@ -17,7 +17,7 @@ class TestingBrowserProcessPlatformPart : public BrowserProcessPlatformPart {
 
 #if defined(OS_CHROMEOS)
   // Overridden from BrowserProcessPlatformPart:
-  virtual chromeos::OomPriorityManager* oom_priority_manager() OVERRIDE;
+  virtual chromeos::OomPriorityManager* oom_priority_manager() override;
 #endif
 
  private:
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index ca36ace..64d44da 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -112,10 +112,10 @@ class WaitTopSitesLoadedObserver : public history::TopSitesObserver {
  public:
   explicit WaitTopSitesLoadedObserver(content::MessageLoopRunner* runner)
       : runner_(runner) {}
-  virtual void TopSitesLoaded(history::TopSites* top_sites) OVERRIDE {
+  virtual void TopSitesLoaded(history::TopSites* top_sites) override {
     runner_->Quit();
   }
-  virtual void TopSitesChanged(history::TopSites* top_sites) OVERRIDE {}
+  virtual void TopSitesChanged(history::TopSites* top_sites) override {}
 
  private:
   // weak
@@ -130,11 +130,11 @@ class QuittingHistoryDBTask : public history::HistoryDBTask {
   QuittingHistoryDBTask() {}
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) OVERRIDE {
+                             history::HistoryDatabase* db) override {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() OVERRIDE {
+  virtual void DoneRunOnMainThread() override {
     base::MessageLoop::current()->Quit();
   }
 
@@ -163,13 +163,13 @@ class TestExtensionURLRequestContext : public net::URLRequestContext {
 class TestExtensionURLRequestContextGetter
     : public net::URLRequestContextGetter {
  public:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
+  virtual net::URLRequestContext* GetURLRequestContext() override {
     if (!context_.get())
       context_.reset(new TestExtensionURLRequestContext());
     return context_.get();
   }
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE {
+      GetNetworkTaskRunner() const override {
     return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
   }
 
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index 6c60f06..6117452 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -216,28 +216,28 @@ class TestingProfile : public Profile {
   void SetOffTheRecordProfile(scoped_ptr<Profile> profile);
 
   // content::BrowserContext
-  virtual base::FilePath GetPath() const OVERRIDE;
-  virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() OVERRIDE;
-  virtual bool IsOffTheRecord() const OVERRIDE;
+  virtual base::FilePath GetPath() const override;
+  virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
+  virtual bool IsOffTheRecord() const override;
   virtual content::DownloadManagerDelegate*
-      GetDownloadManagerDelegate() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+      GetDownloadManagerDelegate() override;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual content::ResourceContext* GetResourceContext() OVERRIDE;
-  virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
-  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
-  virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE;
-  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
+      int renderer_child_id) override;
+  virtual content::ResourceContext* GetResourceContext() override;
+  virtual content::BrowserPluginGuestManager* GetGuestManager() override;
+  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  virtual content::PushMessagingService* GetPushMessagingService() override;
+  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
 
-  virtual TestingProfile* AsTestingProfile() OVERRIDE;
+  virtual TestingProfile* AsTestingProfile() override;
 
   // Profile
-  virtual std::string GetProfileName() OVERRIDE;
-  virtual ProfileType GetProfileType() const OVERRIDE;
+  virtual std::string GetProfileName() override;
+  virtual ProfileType GetProfileType() const override;
 
   // DEPRECATED, because it's fragile to change a profile from non-incognito
   // to incognito after the ProfileKeyedServices have been created (some
@@ -256,79 +256,79 @@ class TestingProfile : public Profile {
     force_incognito_ = force_incognito;
   }
 
-  virtual Profile* GetOffTheRecordProfile() OVERRIDE;
-  virtual void DestroyOffTheRecordProfile() OVERRIDE {}
-  virtual bool HasOffTheRecordProfile() OVERRIDE;
-  virtual Profile* GetOriginalProfile() OVERRIDE;
-  virtual bool IsSupervised() OVERRIDE;
+  virtual Profile* GetOffTheRecordProfile() override;
+  virtual void DestroyOffTheRecordProfile() override {}
+  virtual bool HasOffTheRecordProfile() override;
+  virtual Profile* GetOriginalProfile() override;
+  virtual bool IsSupervised() override;
 #if defined(ENABLE_EXTENSIONS)
   void SetExtensionSpecialStoragePolicy(
       ExtensionSpecialStoragePolicy* extension_special_storage_policy);
 #endif
   virtual ExtensionSpecialStoragePolicy*
-      GetExtensionSpecialStoragePolicy() OVERRIDE;
+      GetExtensionSpecialStoragePolicy() override;
   // TODO(ajwong): Remove this API in favor of directly retrieving the
   // CookieStore from the StoragePartition after ExtensionURLRequestContext
   // has been removed.
   net::CookieMonster* GetCookieMonster();
 
-  virtual PrefService* GetPrefs() OVERRIDE;
+  virtual PrefService* GetPrefs() override;
 
-  virtual history::TopSites* GetTopSites() OVERRIDE;
-  virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
+  virtual history::TopSites* GetTopSites() override;
+  virtual history::TopSites* GetTopSitesWithoutCreating() override;
 
-  virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
+  virtual net::URLRequestContextGetter* GetMediaRequestContext() override;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
+      int renderer_child_id) override;
   virtual net::URLRequestContextGetter*
-      GetRequestContextForExtensions() OVERRIDE;
+      GetRequestContextForExtensions() override;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
           const base::FilePath& partition_path,
-          bool in_memory) OVERRIDE;
+          bool in_memory) override;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
-  virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
-  virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
+  virtual net::SSLConfigService* GetSSLConfigService() override;
+  virtual HostContentSettingsMap* GetHostContentSettingsMap() override;
   void set_last_session_exited_cleanly(bool value) {
     last_session_exited_cleanly_ = value;
   }
-  virtual bool IsSameProfile(Profile *p) OVERRIDE;
-  virtual base::Time GetStartTime() const OVERRIDE;
-  virtual base::FilePath last_selected_directory() OVERRIDE;
-  virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE;
-  virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;
-  virtual bool IsGuestSession() const OVERRIDE;
-  virtual void SetExitType(ExitType exit_type) OVERRIDE {}
-  virtual ExitType GetLastSessionExitType() OVERRIDE;
+  virtual bool IsSameProfile(Profile *p) override;
+  virtual base::Time GetStartTime() const override;
+  virtual base::FilePath last_selected_directory() override;
+  virtual void set_last_selected_directory(const base::FilePath& path) override;
+  virtual bool WasCreatedByVersionOrLater(const std::string& version) override;
+  virtual bool IsGuestSession() const override;
+  virtual void SetExitType(ExitType exit_type) override {}
+  virtual ExitType GetLastSessionExitType() override;
 #if defined(OS_CHROMEOS)
   virtual void ChangeAppLocale(const std::string&,
-                               AppLocaleChangedVia) OVERRIDE {
+                               AppLocaleChangedVia) override {
   }
-  virtual void OnLogin() OVERRIDE {
+  virtual void OnLogin() override {
   }
-  virtual void InitChromeOSPreferences() OVERRIDE {
+  virtual void InitChromeOSPreferences() override {
   }
 #endif  // defined(OS_CHROMEOS)
 
-  virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
+  virtual PrefProxyConfigTracker* GetProxyConfigTracker() override;
 
   // Schedules a task on the history backend and runs a nested loop until the
   // task is processed.  This has the effect of blocking the caller until the
   // history service processes all pending requests.
   void BlockUntilHistoryProcessesPendingRequests();
 
-  virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
-  virtual DevToolsNetworkController* GetDevToolsNetworkController() OVERRIDE;
+  virtual chrome_browser_net::Predictor* GetNetworkPredictor() override;
+  virtual DevToolsNetworkController* GetDevToolsNetworkController() override;
   virtual void ClearNetworkingHistorySince(
       base::Time time,
-      const base::Closure& completion) OVERRIDE;
-  virtual GURL GetHomePage() OVERRIDE;
+      const base::Closure& completion) override;
+  virtual GURL GetHomePage() override;
 
-  virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
+  virtual PrefService* GetOffTheRecordPrefs() override;
 
   void set_profile_name(const std::string& profile_name) {
     profile_name_ = profile_name;
diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc
index 2d49f6d..a415511 100644
--- a/chrome/test/base/testing_profile_manager.cc
+++ b/chrome/test/base/testing_profile_manager.cc
@@ -29,7 +29,7 @@ class ProfileManager : public ::ProfileManagerWithoutInit {
 
  protected:
   virtual Profile* CreateProfileHelper(
-      const base::FilePath& file_path) OVERRIDE {
+      const base::FilePath& file_path) override {
     return new TestingProfile(file_path);
   }
 };
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
index 53af5af..8a37ab9 100644
--- a/chrome/test/base/tracing.cc
+++ b/chrome/test/base/tracing.cc
@@ -24,11 +24,11 @@ class StringTraceSink : public content::TracingController::TraceDataSink {
   StringTraceSink(std::string* result, const base::Closure& callback)
       : result_(result), completion_callback_(callback) {}
 
-  virtual void AddTraceChunk(const std::string& chunk) OVERRIDE {
+  virtual void AddTraceChunk(const std::string& chunk) override {
     *result_ += result_->empty() ? "[" : ",";
     *result_ += chunk;
   }
-  virtual void Close() OVERRIDE {
+  virtual void Close() override {
     if (!result_->empty())
       *result_ += "]";
     completion_callback_.Run();
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 34afdf5..3d96ab3 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -179,7 +179,7 @@ class WindowedTabAddedNotificationObserver
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   content::WebContents* added_tab_;
@@ -212,7 +212,7 @@ class WindowedNotificationObserverWithDetails
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     const U* details_ptr = content::Details<U>(details).ptr();
     if (details_ptr)
       details_[source.map_key()] = *details_ptr;
@@ -238,7 +238,7 @@ class UrlLoadObserver : public content::WindowedNotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   GURL url_;
diff --git a/chrome/test/base/v8_unit_test.h b/chrome/test/base/v8_unit_test.h
index b12238f..8a306ae 100644
--- a/chrome/test/base/v8_unit_test.h
+++ b/chrome/test/base/v8_unit_test.h
@@ -22,7 +22,7 @@ class V8UnitTest : public testing::Test {
   virtual ~V8UnitTest();
 
   // Methods from testing::Test.
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   // Add a custom helper JS library for your test. If |library_path| is
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index b8c2a3a..392a6b94 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -28,13 +28,13 @@ class TestView : public views::View {
     PreferredSizeChanged();
   }
 
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  virtual gfx::Size GetPreferredSize() const override {
     if (!preferred_size_.IsEmpty())
       return preferred_size_;
     return View::GetPreferredSize();
   }
 
-  virtual void Layout() OVERRIDE {
+  virtual void Layout() override {
     View* child_view = child_at(0);
     child_view->SetBounds(0, 0, width(), height());
   }
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h
index a3d7290..e7ff35d 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -79,16 +79,16 @@ class ViewEventTestBase : public views::WidgetDelegate,
   static void SetUpTestCase();
 
   // Creates a window.
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   // Destroys the window.
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   // Overridden from views::WidgetDelegate:
-  virtual bool CanResize() const OVERRIDE;
-  virtual views::View* GetContentsView() OVERRIDE;
-  virtual const views::Widget* GetWidget() const OVERRIDE;
-  virtual views::Widget* GetWidget() OVERRIDE;
+  virtual bool CanResize() const override;
+  virtual views::View* GetContentsView() override;
+  virtual const views::Widget* GetWidget() const override;
+  virtual views::Widget* GetWidget() override;
 
   // Overridden to do nothing so that this class can be used in runnable tasks.
   void AddRef() {}
diff --git a/chrome/test/base/view_event_test_platform_part_ash.cc b/chrome/test/base/view_event_test_platform_part_ash.cc
index 51ed1c4..070ae36 100644
--- a/chrome/test/base/view_event_test_platform_part_ash.cc
+++ b/chrome/test/base/view_event_test_platform_part_ash.cc
@@ -19,7 +19,7 @@ class ViewEventTestPlatformPartAsh : public ViewEventTestPlatformPart {
   virtual ~ViewEventTestPlatformPartAsh();
 
   // Overridden from ViewEventTestPlatformPart:
-  virtual gfx::NativeWindow GetContext() OVERRIDE {
+  virtual gfx::NativeWindow GetContext() override {
     return NULL;  // No context, so that desktop tree hosts are used by default.
   }
 
diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc
index 007300f..4e9b12e 100644
--- a/chrome/test/base/view_event_test_platform_part_chromeos.cc
+++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc
@@ -26,7 +26,7 @@ class ViewEventTestPlatformPartChromeOS : public ViewEventTestPlatformPart {
   virtual ~ViewEventTestPlatformPartChromeOS();
 
   // Overridden from ViewEventTestPlatformPart:
-  virtual gfx::NativeWindow GetContext() OVERRIDE {
+  virtual gfx::NativeWindow GetContext() override {
     return ash::Shell::GetPrimaryRootWindow();
   }
 
diff --git a/chrome/test/base/view_event_test_platform_part_mac.mm b/chrome/test/base/view_event_test_platform_part_mac.mm
index d20ab7f..60c9703 100644
--- a/chrome/test/base/view_event_test_platform_part_mac.mm
+++ b/chrome/test/base/view_event_test_platform_part_mac.mm
@@ -12,7 +12,7 @@ class ViewEventTestPlatformPartMac : public ViewEventTestPlatformPart {
   ViewEventTestPlatformPartMac() {}
 
   // Overridden from ViewEventTestPlatformPart:
-  virtual gfx::NativeWindow GetContext() OVERRIDE { return NULL; }
+  virtual gfx::NativeWindow GetContext() override { return NULL; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ViewEventTestPlatformPartMac);
diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc
index 997c14a..77bfe91 100644
--- a/chrome/test/base/web_ui_browser_test.cc
+++ b/chrome/test/base/web_ui_browser_test.cc
@@ -71,7 +71,7 @@ class WebUIJsInjectionReadyObserver : public content::WebContentsObserver {
         preload_test_fixture_(preload_test_fixture),
         preload_test_name_(preload_test_name) {}
 
-  virtual void RenderViewCreated(content::RenderViewHost* rvh) OVERRIDE {
+  virtual void RenderViewCreated(content::RenderViewHost* rvh) override {
     browser_test_->PreLoadJavascriptLibraries(
         preload_test_fixture_, preload_test_name_, rvh);
   }
@@ -243,7 +243,7 @@ class PrintContentBrowserClient : public chrome::ChromeContentBrowserClient {
  private:
   // ChromeContentBrowserClient implementation:
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
-      content::WebContents* web_contents) OVERRIDE {
+      content::WebContents* web_contents) override {
     preview_dialog_ = web_contents;
     observer_.reset(new WebUIJsInjectionReadyObserver(preview_dialog_,
                                                       browser_test_,
@@ -319,20 +319,20 @@ class MockWebUIDataSource : public content::URLDataSource {
  private:
   virtual ~MockWebUIDataSource() {}
 
-  virtual std::string GetSource() const OVERRIDE { return "dummyurl"; }
+  virtual std::string GetSource() const override { return "dummyurl"; }
 
   virtual void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
-      const content::URLDataSource::GotDataCallback& callback) OVERRIDE {
+      const content::URLDataSource::GotDataCallback& callback) override {
     std::string dummy_html = "<html><body>Dummy</body></html>";
     scoped_refptr<base::RefCountedString> response =
         base::RefCountedString::TakeString(&dummy_html);
     callback.Run(response.get());
   }
 
-  virtual std::string GetMimeType(const std::string& path) const OVERRIDE {
+  virtual std::string GetMimeType(const std::string& path) const override {
     return "text/html";
   }
 
@@ -348,7 +348,7 @@ class MockWebUIProvider
 
   // Returns a new WebUI
   virtual WebUIController* NewWebUI(content::WebUI* web_ui,
-                                    const GURL& url) OVERRIDE {
+                                    const GURL& url) override {
     WebUIController* controller = new content::WebUIController(web_ui);
     Profile* profile = Profile::FromWebUI(web_ui);
     content::URLDataSource::Add(profile, new MockWebUIDataSource());
diff --git a/chrome/test/base/web_ui_browser_test.h b/chrome/test/base/web_ui_browser_test.h
index 3220442..8a436a6 100644
--- a/chrome/test/base/web_ui_browser_test.h
+++ b/chrome/test/base/web_ui_browser_test.h
@@ -112,8 +112,8 @@ class WebUIBrowserTest : public JavaScriptBrowserTest {
   void set_preload_test_name(const std::string& preload_test_name);
 
   // Set up & tear down console error catching.
-  virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void TearDownOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
+  virtual void TearDownOnMainThread() override;
 
   // Set a WebUI instance to run tests on.
   void SetWebUIInstance(content::WebUI* web_ui);
diff --git a/chrome/test/base/web_ui_browser_test_browsertest.cc b/chrome/test/base/web_ui_browser_test_browsertest.cc
index 5fe1392..7e57695 100644
--- a/chrome/test/base/web_ui_browser_test_browsertest.cc
+++ b/chrome/test/base/web_ui_browser_test_browsertest.cc
@@ -108,7 +108,7 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
     MOCK_METHOD1(HandleTestPasses, void(const base::ListValue*));
 
    private:
-    virtual void RegisterMessages() OVERRIDE {
+    virtual void RegisterMessages() override {
       web_ui()->RegisterMessageCallback("startAsyncTest",
           base::Bind(&AsyncWebUIMessageHandler::HandleStartAsyncTest,
                      base::Unretained(this)));
@@ -138,12 +138,12 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
 
  private:
   // Provide this object's handler.
-  virtual WebUIMessageHandler* GetMockMessageHandler() OVERRIDE {
+  virtual WebUIMessageHandler* GetMockMessageHandler() override {
     return &message_handler_;
   }
 
   // Set up and browse to kDummyURL for all tests.
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     WebUIBrowserTest::SetUpOnMainThread();
     AddLibrary(base::FilePath(FILE_PATH_LITERAL("async.js")));
     ui_test_utils::NavigateToURL(browser(), GURL(kDummyURL));
diff --git a/chrome/test/chromedriver/chrome/adb_impl.h b/chrome/test/chromedriver/chrome/adb_impl.h
index bf2e6ce..043986d 100644
--- a/chrome/test/chromedriver/chrome/adb_impl.h
+++ b/chrome/test/chromedriver/chrome/adb_impl.h
@@ -26,28 +26,28 @@ class AdbImpl : public Adb {
   virtual ~AdbImpl();
 
   // Overridden from Adb:
-  virtual Status GetDevices(std::vector<std::string>* devices) OVERRIDE;
+  virtual Status GetDevices(std::vector<std::string>* devices) override;
   virtual Status ForwardPort(const std::string& device_serial,
                              int local_port,
-                             const std::string& remote_abstract) OVERRIDE;
+                             const std::string& remote_abstract) override;
   virtual Status SetCommandLineFile(const std::string& device_serial,
                                     const std::string& command_line_file,
                                     const std::string& exec_name,
-                                    const std::string& args) OVERRIDE;
+                                    const std::string& args) override;
   virtual Status CheckAppInstalled(const std::string& device_serial,
-                                   const std::string& package) OVERRIDE;
+                                   const std::string& package) override;
   virtual Status ClearAppData(const std::string& device_serial,
-                              const std::string& package) OVERRIDE;
+                              const std::string& package) override;
   virtual Status SetDebugApp(const std::string& device_serial,
-                             const std::string& package) OVERRIDE;
+                             const std::string& package) override;
   virtual Status Launch(const std::string& device_serial,
                         const std::string& package,
-                        const std::string& activity) OVERRIDE;
+                        const std::string& activity) override;
   virtual Status ForceStop(const std::string& device_serial,
-                           const std::string& package) OVERRIDE;
+                           const std::string& package) override;
   virtual Status GetPidByName(const std::string& device_serial,
                               const std::string& process_name,
-                              int* pid) OVERRIDE;
+                              int* pid) override;
 
  private:
   Status ExecuteCommand(const std::string& command,
diff --git a/chrome/test/chromedriver/chrome/chrome_android_impl.h b/chrome/test/chromedriver/chrome/chrome_android_impl.h
index 87d0e9f..ae86a57 100644
--- a/chrome/test/chromedriver/chrome/chrome_android_impl.h
+++ b/chrome/test/chromedriver/chrome/chrome_android_impl.h
@@ -26,10 +26,10 @@ class ChromeAndroidImpl : public ChromeImpl {
   virtual ~ChromeAndroidImpl();
 
   // Overridden from Chrome:
-  virtual std::string GetOperatingSystemName() OVERRIDE;
+  virtual std::string GetOperatingSystemName() override;
 
   // Overridden from ChromeImpl:
-  virtual Status QuitImpl() OVERRIDE;
+  virtual Status QuitImpl() override;
 
  private:
   scoped_ptr<Device> device_;
diff --git a/chrome/test/chromedriver/chrome/chrome_desktop_impl.h b/chrome/test/chromedriver/chrome/chrome_desktop_impl.h
index c36fafd..8a973dc 100644
--- a/chrome/test/chromedriver/chrome/chrome_desktop_impl.h
+++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl.h
@@ -47,12 +47,12 @@ class ChromeDesktopImpl : public ChromeImpl {
   Status GetAutomationExtension(AutomationExtension** extension);
 
   // Overridden from Chrome:
-  virtual ChromeDesktopImpl* GetAsDesktop() OVERRIDE;
-  virtual std::string GetOperatingSystemName() OVERRIDE;
+  virtual ChromeDesktopImpl* GetAsDesktop() override;
+  virtual std::string GetOperatingSystemName() override;
 
   // Overridden from ChromeImpl:
-  virtual bool IsMobileEmulationEnabled() const OVERRIDE;
-  virtual Status QuitImpl() OVERRIDE;
+  virtual bool IsMobileEmulationEnabled() const override;
+  virtual Status QuitImpl() override;
 
   const base::CommandLine& command() const;
 
diff --git a/chrome/test/chromedriver/chrome/chrome_impl.h b/chrome/test/chromedriver/chrome/chrome_impl.h
index 01a5345..22ecd91 100644
--- a/chrome/test/chromedriver/chrome/chrome_impl.h
+++ b/chrome/test/chromedriver/chrome/chrome_impl.h
@@ -30,16 +30,16 @@ class ChromeImpl : public Chrome {
   virtual ~ChromeImpl();
 
   // Overridden from Chrome:
-  virtual ChromeDesktopImpl* GetAsDesktop() OVERRIDE;
-  virtual const BrowserInfo* GetBrowserInfo() OVERRIDE;
-  virtual bool HasCrashedWebView() OVERRIDE;
-  virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) OVERRIDE;
+  virtual ChromeDesktopImpl* GetAsDesktop() override;
+  virtual const BrowserInfo* GetBrowserInfo() override;
+  virtual bool HasCrashedWebView() override;
+  virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) override;
   virtual Status GetWebViewById(const std::string& id,
-                                WebView** web_view) OVERRIDE;
-  virtual Status CloseWebView(const std::string& id) OVERRIDE;
-  virtual Status ActivateWebView(const std::string& id) OVERRIDE;
-  virtual bool IsMobileEmulationEnabled() const OVERRIDE;
-  virtual Status Quit() OVERRIDE;
+                                WebView** web_view) override;
+  virtual Status CloseWebView(const std::string& id) override;
+  virtual Status ActivateWebView(const std::string& id) override;
+  virtual bool IsMobileEmulationEnabled() const override;
+  virtual Status Quit() override;
 
  protected:
   ChromeImpl(
diff --git a/chrome/test/chromedriver/chrome/chrome_remote_impl.h b/chrome/test/chromedriver/chrome/chrome_remote_impl.h
index 7981477..6fffaae 100644
--- a/chrome/test/chromedriver/chrome/chrome_remote_impl.h
+++ b/chrome/test/chromedriver/chrome/chrome_remote_impl.h
@@ -23,10 +23,10 @@ class ChromeRemoteImpl : public ChromeImpl {
   virtual ~ChromeRemoteImpl();
 
   // Overridden from Chrome.
-  virtual std::string GetOperatingSystemName() OVERRIDE;
+  virtual std::string GetOperatingSystemName() override;
 
   // Overridden from ChromeImpl.
-  virtual Status QuitImpl() OVERRIDE;
+  virtual Status QuitImpl() override;
 };
 
 #endif  // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_REMOTE_IMPL_H_
diff --git a/chrome/test/chromedriver/chrome/console_logger.h b/chrome/test/chromedriver/chrome/console_logger.h
index 4efdcf3..f8a957e 100644
--- a/chrome/test/chromedriver/chrome/console_logger.h
+++ b/chrome/test/chromedriver/chrome/console_logger.h
@@ -24,11 +24,11 @@ class ConsoleLogger : public DevToolsEventListener {
   explicit ConsoleLogger(Log* log);
 
   // Enables Console events for the client, which must not be null.
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   // Translates an event into a log entry.
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   Log* log_;  // The log where to create entries.
diff --git a/chrome/test/chromedriver/chrome/console_logger_unittest.cc b/chrome/test/chromedriver/chrome/console_logger_unittest.cc
index 79760d9..f72a11c 100644
--- a/chrome/test/chromedriver/chrome/console_logger_unittest.cc
+++ b/chrome/test/chromedriver/chrome/console_logger_unittest.cc
@@ -37,24 +37,24 @@ class FakeDevToolsClient : public StubDevToolsClient {
   }
 
   // Overridden from DevToolsClient:
-  virtual Status ConnectIfNecessary() OVERRIDE {
+  virtual Status ConnectIfNecessary() override {
     return listener_->OnConnected(this);
   }
 
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     sent_command_queue_.push_back(method);
     return Status(kOk);
   }
 
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE {
+  virtual void AddListener(DevToolsEventListener* listener) override {
     CHECK(!listener_);
     listener_ = listener;
   }
 
-  virtual const std::string& GetId() OVERRIDE {
+  virtual const std::string& GetId() override {
     return id_;
   }
 
@@ -82,7 +82,7 @@ class FakeLog : public Log {
   virtual void AddEntryTimestamped(const base::Time& timestamp,
                                    Level level,
                                    const std::string& source,
-                                   const std::string& message) OVERRIDE;
+                                   const std::string& message) override;
 
   const ScopedVector<LogEntry>& GetEntries() {
     return entries_;
diff --git a/chrome/test/chromedriver/chrome/debugger_tracker.h b/chrome/test/chromedriver/chrome/debugger_tracker.h
index 568c42d..a1d5f39 100644
--- a/chrome/test/chromedriver/chrome/debugger_tracker.h
+++ b/chrome/test/chromedriver/chrome/debugger_tracker.h
@@ -27,7 +27,7 @@ class DebuggerTracker : public DevToolsEventListener {
   // Overridden from DevToolsEventListener:
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DebuggerTracker);
diff --git a/chrome/test/chromedriver/chrome/device_manager_unittest.cc b/chrome/test/chromedriver/chrome/device_manager_unittest.cc
index 05e789b..b600388 100644
--- a/chrome/test/chromedriver/chrome/device_manager_unittest.cc
+++ b/chrome/test/chromedriver/chrome/device_manager_unittest.cc
@@ -19,7 +19,7 @@ class FakeAdb : public Adb {
   FakeAdb() {}
   virtual ~FakeAdb() {}
 
-  virtual Status GetDevices(std::vector<std::string>* devices) OVERRIDE {
+  virtual Status GetDevices(std::vector<std::string>* devices) override {
     devices->push_back("a");
     devices->push_back("b");
     return Status(kOk);
@@ -27,46 +27,46 @@ class FakeAdb : public Adb {
 
   virtual Status ForwardPort(const std::string& device_serial,
                              int local_port,
-                             const std::string& remote_abstract) OVERRIDE {
+                             const std::string& remote_abstract) override {
     return Status(kOk);
   }
 
   virtual Status SetCommandLineFile(const std::string& device_serial,
                                     const std::string& command_line_file,
                                     const std::string& exec_name,
-                                    const std::string& args) OVERRIDE {
+                                    const std::string& args) override {
     return Status(kOk);
   }
 
   virtual Status CheckAppInstalled(const std::string& device_serial,
-                                   const std::string& package) OVERRIDE {
+                                   const std::string& package) override {
     return Status(kOk);
   }
 
   virtual Status ClearAppData(const std::string& device_serial,
-                              const std::string& package) OVERRIDE {
+                              const std::string& package) override {
     return Status(kOk);
   }
 
   virtual Status SetDebugApp(const std::string& device_serial,
-                              const std::string& package) OVERRIDE {
+                              const std::string& package) override {
     return Status(kOk);
   }
 
   virtual Status Launch(const std::string& device_serial,
                         const std::string& package,
-                        const std::string& activity) OVERRIDE {
+                        const std::string& activity) override {
     return Status(kOk);
   }
 
   virtual Status ForceStop(const std::string& device_serial,
-                           const std::string& package) OVERRIDE {
+                           const std::string& package) override {
     return Status(kOk);
   }
 
   virtual Status GetPidByName(const std::string& device_serial,
                               const std::string& process_name,
-                              int* pid) OVERRIDE {
+                              int* pid) override {
     *pid = 0; // avoid uninit error crbug.com/393231
     return Status(kOk);
   }
diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl.h b/chrome/test/chromedriver/chrome/devtools_client_impl.h
index 34bb203..3d4d9e5 100644
--- a/chrome/test/chromedriver/chrome/devtools_client_impl.h
+++ b/chrome/test/chromedriver/chrome/devtools_client_impl.h
@@ -81,20 +81,20 @@ class DevToolsClientImpl : public DevToolsClient {
   void SetParserFuncForTesting(const ParserFunc& parser_func);
 
   // Overridden from DevToolsClient:
-  virtual const std::string& GetId() OVERRIDE;
-  virtual bool WasCrashed() OVERRIDE;
-  virtual Status ConnectIfNecessary() OVERRIDE;
+  virtual const std::string& GetId() override;
+  virtual bool WasCrashed() override;
+  virtual Status ConnectIfNecessary() override;
   virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE;
+                             const base::DictionaryValue& params) override;
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE;
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE;
+      scoped_ptr<base::DictionaryValue>* result) override;
+  virtual void AddListener(DevToolsEventListener* listener) override;
   virtual Status HandleEventsUntil(
       const ConditionalFunc& conditional_func,
-      const base::TimeDelta& timeout) OVERRIDE;
-  virtual Status HandleReceivedEvents() OVERRIDE;
+      const base::TimeDelta& timeout) override;
+  virtual Status HandleReceivedEvents() override;
 
  private:
   enum ResponseState {
diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc
index 75efe88..c7b30ff 100644
--- a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc
+++ b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc
@@ -31,17 +31,17 @@ class MockSyncWebSocket : public SyncWebSocket {
   MockSyncWebSocket() : connected_(false), id_(-1), queued_messages_(1) {}
   virtual ~MockSyncWebSocket() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return connected_;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     EXPECT_STREQ("http://url/", url.possibly_invalid_spec().c_str());
     connected_ = true;
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     EXPECT_TRUE(connected_);
     scoped_ptr<base::Value> value(base::JSONReader::Read(message));
     base::DictionaryValue* dict = NULL;
@@ -64,7 +64,7 @@ class MockSyncWebSocket : public SyncWebSocket {
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     if (timeout <= base::TimeDelta())
       return SyncWebSocket::kTimeout;
     base::DictionaryValue response;
@@ -77,7 +77,7 @@ class MockSyncWebSocket : public SyncWebSocket {
     return SyncWebSocket::kOk;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return queued_messages_ > 0;
   }
 
@@ -135,27 +135,27 @@ class MockSyncWebSocket2 : public SyncWebSocket {
   MockSyncWebSocket2() {}
   virtual ~MockSyncWebSocket2() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return false;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     return false;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     EXPECT_TRUE(false);
     return false;
   }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     EXPECT_TRUE(false);
     return SyncWebSocket::kDisconnected;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return true;
   }
 };
@@ -177,27 +177,27 @@ class MockSyncWebSocket3 : public SyncWebSocket {
   MockSyncWebSocket3() : connected_(false) {}
   virtual ~MockSyncWebSocket3() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return connected_;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     connected_ = true;
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     return false;
   }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     EXPECT_TRUE(false);
     return SyncWebSocket::kDisconnected;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return true;
   }
 
@@ -224,26 +224,26 @@ class MockSyncWebSocket4 : public SyncWebSocket {
   MockSyncWebSocket4() : connected_(false) {}
   virtual ~MockSyncWebSocket4() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return connected_;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     connected_ = true;
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     return true;
   }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     return SyncWebSocket::kDisconnected;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return true;
   }
 
@@ -270,27 +270,27 @@ class FakeSyncWebSocket : public SyncWebSocket {
   FakeSyncWebSocket() : connected_(false) {}
   virtual ~FakeSyncWebSocket() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return connected_;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     EXPECT_FALSE(connected_);
     connected_ = true;
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     return true;
   }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     return SyncWebSocket::kOk;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return true;
   }
 
@@ -353,13 +353,13 @@ class MockListener : public DevToolsEventListener {
     EXPECT_TRUE(called_);
   }
 
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE {
+  virtual Status OnConnected(DevToolsClient* client) override {
     return Status(kOk);
   }
 
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     called_ = true;
     EXPECT_STREQ("method", method.c_str());
     EXPECT_TRUE(params.HasKey("key"));
@@ -702,7 +702,7 @@ class OnConnectedListener : public DevToolsEventListener {
     EXPECT_TRUE(on_event_called_);
   }
 
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE {
+  virtual Status OnConnected(DevToolsClient* client) override {
     EXPECT_EQ(client_, client);
     EXPECT_STREQ("onconnected-id", client->GetId().c_str());
     EXPECT_FALSE(on_connected_called_);
@@ -714,7 +714,7 @@ class OnConnectedListener : public DevToolsEventListener {
 
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     EXPECT_EQ(client_, client);
     EXPECT_STREQ("onconnected-id", client->GetId().c_str());
     EXPECT_TRUE(on_connected_called_);
@@ -734,16 +734,16 @@ class OnConnectedSyncWebSocket : public SyncWebSocket {
   OnConnectedSyncWebSocket() : connected_(false) {}
   virtual ~OnConnectedSyncWebSocket() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return connected_;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     connected_ = true;
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     EXPECT_TRUE(connected_);
     scoped_ptr<base::Value> value(base::JSONReader::Read(message));
     base::DictionaryValue* dict = NULL;
@@ -775,7 +775,7 @@ class OnConnectedSyncWebSocket : public SyncWebSocket {
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     if (queued_response_.empty())
       return SyncWebSocket::kDisconnected;
     *message = queued_response_.front();
@@ -783,7 +783,7 @@ class OnConnectedSyncWebSocket : public SyncWebSocket {
     return SyncWebSocket::kOk;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return !queued_response_.empty();
   }
 
@@ -832,21 +832,21 @@ class MockSyncWebSocket5 : public SyncWebSocket {
   MockSyncWebSocket5() : request_no_(0) {}
   virtual ~MockSyncWebSocket5() {}
 
-  virtual bool IsConnected() OVERRIDE {
+  virtual bool IsConnected() override {
     return true;
   }
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     return true;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     return true;
   }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     if (request_no_ == 0) {
       *message = "{\"method\": \"m\", \"params\": {}}";
     } else {
@@ -857,7 +857,7 @@ class MockSyncWebSocket5 : public SyncWebSocket {
     return SyncWebSocket::kOk;
   }
 
-  virtual bool HasNextMessage() OVERRIDE {
+  virtual bool HasNextMessage() override {
     return false;
   }
 
@@ -870,12 +870,12 @@ class OtherEventListener : public DevToolsEventListener {
   OtherEventListener() : received_event_(false) {}
   virtual ~OtherEventListener() {}
 
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE {
+  virtual Status OnConnected(DevToolsClient* client) override {
     return Status(kOk);
   }
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     received_event_ = true;
     return Status(kOk);
   }
@@ -891,14 +891,14 @@ class OnEventListener : public DevToolsEventListener {
         other_listener_(other_listener) {}
   virtual ~OnEventListener() {}
 
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE {
+  virtual Status OnConnected(DevToolsClient* client) override {
     EXPECT_EQ(client_, client);
     return Status(kOk);
   }
 
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     EXPECT_EQ(client_, client);
     client_->SendCommand("method", params);
     EXPECT_TRUE(other_listener_->received_event_);
@@ -932,13 +932,13 @@ class DisconnectedSyncWebSocket : public MockSyncWebSocket {
   DisconnectedSyncWebSocket() : connection_count_(0), command_count_(0) {}
   virtual ~DisconnectedSyncWebSocket() {}
 
-  virtual bool Connect(const GURL& url) OVERRIDE {
+  virtual bool Connect(const GURL& url) override {
     connection_count_++;
     connected_ = connection_count_ != 2;
     return connected_;
   }
 
-  virtual bool Send(const std::string& message) OVERRIDE {
+  virtual bool Send(const std::string& message) override {
     command_count_++;
     if (command_count_ == 1) {
       connected_ = false;
@@ -992,15 +992,15 @@ class MockSyncWebSocket6 : public SyncWebSocket {
       : messages_(messages) {}
   virtual ~MockSyncWebSocket6() {}
 
-  virtual bool IsConnected() OVERRIDE { return true; }
+  virtual bool IsConnected() override { return true; }
 
-  virtual bool Connect(const GURL& url) OVERRIDE { return true; }
+  virtual bool Connect(const GURL& url) override { return true; }
 
-  virtual bool Send(const std::string& message) OVERRIDE { return true; }
+  virtual bool Send(const std::string& message) override { return true; }
 
   virtual SyncWebSocket::StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     if (messages_->empty())
       return SyncWebSocket::kDisconnected;
     *message = messages_->front();
@@ -1008,7 +1008,7 @@ class MockSyncWebSocket6 : public SyncWebSocket {
     return SyncWebSocket::kOk;
   }
 
-  virtual bool HasNextMessage() OVERRIDE { return messages_->size(); }
+  virtual bool HasNextMessage() override { return messages_->size(); }
 
  private:
   std::list<std::string>* messages_;
@@ -1019,13 +1019,13 @@ class MockDevToolsEventListener : public DevToolsEventListener {
   MockDevToolsEventListener() : id_(1) {}
   virtual ~MockDevToolsEventListener() {}
 
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE {
+  virtual Status OnConnected(DevToolsClient* client) override {
     return Status(kOk);
   }
 
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     id_++;
     Status status = client->SendCommand("hello", params);
     id_--;
@@ -1109,13 +1109,13 @@ class MockCommandListener : public DevToolsEventListener {
 
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE {
+                         const base::DictionaryValue& params) override {
     msgs_.push_back(method);
     return Status(kOk);
   }
 
   virtual Status OnCommandSuccess(DevToolsClient* client,
-                                  const std::string& method) OVERRIDE {
+                                  const std::string& method) override {
     msgs_.push_back(method);
     if (!callback_.is_null())
       callback_.Run(client);
diff --git a/chrome/test/chromedriver/chrome/dom_tracker.h b/chrome/test/chromedriver/chrome/dom_tracker.h
index 4518f4e..d998bfb 100644
--- a/chrome/test/chromedriver/chrome/dom_tracker.h
+++ b/chrome/test/chromedriver/chrome/dom_tracker.h
@@ -29,10 +29,10 @@ class DomTracker : public DevToolsEventListener {
   Status GetFrameIdForNode(int node_id, std::string* frame_id);
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   bool ProcessNodeList(const base::Value* nodes);
diff --git a/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc
index ca6e319..4a5b9ae 100644
--- a/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc
+++ b/chrome/test/chromedriver/chrome/dom_tracker_unittest.cc
@@ -30,14 +30,14 @@ class FakeDevToolsClient : public StubDevToolsClient {
 
   // Overridden from DevToolsClient:
   virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE {
+                             const base::DictionaryValue& params) override {
     sent_command_queue_.push_back(method);
     return Status(kOk);
   }
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     return SendCommand(method, params);
   }
 
diff --git a/chrome/test/chromedriver/chrome/frame_tracker.h b/chrome/test/chromedriver/chrome/frame_tracker.h
index 436c006..cc0c83f 100644
--- a/chrome/test/chromedriver/chrome/frame_tracker.h
+++ b/chrome/test/chromedriver/chrome/frame_tracker.h
@@ -30,10 +30,10 @@ class FrameTracker : public DevToolsEventListener {
   Status GetContextIdForFrame(const std::string& frame_id, int* context_id);
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   std::map<std::string, int> frame_to_context_map_;
diff --git a/chrome/test/chromedriver/chrome/geolocation_override_manager.h b/chrome/test/chromedriver/chrome/geolocation_override_manager.h
index 0ce6353..151bb13 100644
--- a/chrome/test/chromedriver/chrome/geolocation_override_manager.h
+++ b/chrome/test/chromedriver/chrome/geolocation_override_manager.h
@@ -30,10 +30,10 @@ class GeolocationOverrideManager : public DevToolsEventListener {
   Status OverrideGeolocation(const Geoposition& geoposition);
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   Status ApplyOverrideIfNeeded();
diff --git a/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc b/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc
index b5e668d..0785476 100644
--- a/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc
+++ b/chrome/test/chromedriver/chrome/geolocation_override_manager_unittest.cc
@@ -45,7 +45,7 @@ class RecorderDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     commands_.push_back(Command(method, params));
     return Status(kOk);
   }
diff --git a/chrome/test/chromedriver/chrome/heap_snapshot_taker.h b/chrome/test/chromedriver/chrome/heap_snapshot_taker.h
index d9ea592..06b8c25 100644
--- a/chrome/test/chromedriver/chrome/heap_snapshot_taker.h
+++ b/chrome/test/chromedriver/chrome/heap_snapshot_taker.h
@@ -31,7 +31,7 @@ class HeapSnapshotTaker : public DevToolsEventListener {
   // Overridden from DevToolsEventListener:
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   Status TakeSnapshotInternal();
diff --git a/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc b/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
index 2c73ea0..a5e4e2c 100644
--- a/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
+++ b/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
@@ -49,7 +49,7 @@ class DummyDevToolsClient : public StubDevToolsClient {
 
   // Overridden from DevToolsClient:
   virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE {
+                             const base::DictionaryValue& params) override {
     if (!disabled_)
       disabled_ = method == "Debugger.disable";
     if (method == method_ && !error_after_events_)
diff --git a/chrome/test/chromedriver/chrome/javascript_dialog_manager.h b/chrome/test/chromedriver/chrome/javascript_dialog_manager.h
index f5cf389..fd8b806 100644
--- a/chrome/test/chromedriver/chrome/javascript_dialog_manager.h
+++ b/chrome/test/chromedriver/chrome/javascript_dialog_manager.h
@@ -32,10 +32,10 @@ class JavaScriptDialogManager : public DevToolsEventListener {
   Status HandleDialog(bool accept, const std::string* text);
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   DevToolsClient* client_;
diff --git a/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc b/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc
index 4874784..9966672 100644
--- a/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc
+++ b/chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc
@@ -33,7 +33,7 @@ class RecorderDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     method_ = method;
     params_.Clear();
     params_.MergeDictionary(&params);
@@ -109,7 +109,7 @@ class FakeDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     while (closing_count_ > 0) {
       base::DictionaryValue empty;
       Status status =
@@ -120,7 +120,7 @@ class FakeDevToolsClient : public StubDevToolsClient {
     }
     return Status(kOk);
   }
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE {
+  virtual void AddListener(DevToolsEventListener* listener) override {
     listener_ = listener;
   }
 
diff --git a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h
index 61a9560..d10d3fd 100644
--- a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h
+++ b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager.h
@@ -31,10 +31,10 @@ class MobileEmulationOverrideManager : public DevToolsEventListener {
   virtual ~MobileEmulationOverrideManager();
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
  private:
   Status ApplyOverrideIfNeeded();
diff --git a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
index d7401c0..32d8bc0 100644
--- a/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
+++ b/chrome/test/chromedriver/chrome/mobile_emulation_override_manager_unittest.cc
@@ -46,7 +46,7 @@ class RecorderDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     commands_.push_back(Command(method, params));
     return Status(kOk);
   }
diff --git a/chrome/test/chromedriver/chrome/navigation_tracker.h b/chrome/test/chromedriver/chrome/navigation_tracker.h
index 0d02138..f309c59 100644
--- a/chrome/test/chromedriver/chrome/navigation_tracker.h
+++ b/chrome/test/chromedriver/chrome/navigation_tracker.h
@@ -44,12 +44,12 @@ class NavigationTracker : public DevToolsEventListener {
   Status IsPendingNavigation(const std::string& frame_id, bool* is_pending);
 
   // Overridden from DevToolsEventListener:
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
   virtual Status OnCommandSuccess(DevToolsClient* client,
-                                  const std::string& method) OVERRIDE;
+                                  const std::string& method) override;
 
  private:
   DevToolsClient* client_;
diff --git a/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
index 2286ce2..ae35e25 100644
--- a/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
+++ b/chrome/test/chromedriver/chrome/navigation_tracker_unittest.cc
@@ -264,7 +264,7 @@ class FailToEvalScriptDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     if (!is_dom_getDocument_requested_ && method == "DOM.getDocument") {
       is_dom_getDocument_requested_ = true;
       base::DictionaryValue result_dict;
@@ -310,7 +310,7 @@ class DeterminingLoadStateDevToolsClient : public StubDevToolsClient {
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     if (method == "DOM.getDocument") {
       base::DictionaryValue result_dict;
       if (has_empty_base_url_)
diff --git a/chrome/test/chromedriver/chrome/stub_chrome.h b/chrome/test/chromedriver/chrome/stub_chrome.h
index f818523..130c1a5 100644
--- a/chrome/test/chromedriver/chrome/stub_chrome.h
+++ b/chrome/test/chromedriver/chrome/stub_chrome.h
@@ -21,17 +21,17 @@ class StubChrome : public Chrome {
   virtual ~StubChrome();
 
   // Overridden from Chrome:
-  virtual ChromeDesktopImpl* GetAsDesktop() OVERRIDE;
-  virtual const BrowserInfo* GetBrowserInfo() OVERRIDE;
-  virtual bool HasCrashedWebView() OVERRIDE;
-  virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) OVERRIDE;
+  virtual ChromeDesktopImpl* GetAsDesktop() override;
+  virtual const BrowserInfo* GetBrowserInfo() override;
+  virtual bool HasCrashedWebView() override;
+  virtual Status GetWebViewIds(std::list<std::string>* web_view_ids) override;
   virtual Status GetWebViewById(const std::string& id,
-                                WebView** web_view) OVERRIDE;
-  virtual Status CloseWebView(const std::string& id) OVERRIDE;
-  virtual Status ActivateWebView(const std::string& id) OVERRIDE;
-  virtual std::string GetOperatingSystemName() OVERRIDE;
-  virtual bool IsMobileEmulationEnabled() const OVERRIDE;
-  virtual Status Quit() OVERRIDE;
+                                WebView** web_view) override;
+  virtual Status CloseWebView(const std::string& id) override;
+  virtual Status ActivateWebView(const std::string& id) override;
+  virtual std::string GetOperatingSystemName() override;
+  virtual bool IsMobileEmulationEnabled() const override;
+  virtual Status Quit() override;
 
  private:
   BrowserInfo browser_info_;
diff --git a/chrome/test/chromedriver/chrome/stub_devtools_client.h b/chrome/test/chromedriver/chrome/stub_devtools_client.h
index 911854c..66d01f8 100644
--- a/chrome/test/chromedriver/chrome/stub_devtools_client.h
+++ b/chrome/test/chromedriver/chrome/stub_devtools_client.h
@@ -25,19 +25,19 @@ class StubDevToolsClient : public DevToolsClient {
   virtual ~StubDevToolsClient();
 
   // Overridden from DevToolsClient:
-  virtual const std::string& GetId() OVERRIDE;
-  virtual bool WasCrashed() OVERRIDE;
-  virtual Status ConnectIfNecessary() OVERRIDE;
+  virtual const std::string& GetId() override;
+  virtual bool WasCrashed() override;
+  virtual Status ConnectIfNecessary() override;
   virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE;
+                             const base::DictionaryValue& params) override;
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE;
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE;
+      scoped_ptr<base::DictionaryValue>* result) override;
+  virtual void AddListener(DevToolsEventListener* listener) override;
   virtual Status HandleEventsUntil(const ConditionalFunc& conditional_func,
-                                   const base::TimeDelta& timeout) OVERRIDE;
-  virtual Status HandleReceivedEvents() OVERRIDE;
+                                   const base::TimeDelta& timeout) override;
+  virtual Status HandleReceivedEvents() override;
 
  protected:
   const std::string id_;
diff --git a/chrome/test/chromedriver/chrome/stub_web_view.h b/chrome/test/chromedriver/chrome/stub_web_view.h
index 8ebd374..f282082 100644
--- a/chrome/test/chromedriver/chrome/stub_web_view.h
+++ b/chrome/test/chromedriver/chrome/stub_web_view.h
@@ -18,58 +18,58 @@ class StubWebView : public WebView {
   virtual ~StubWebView();
 
   // Overridden from WebView:
-  virtual std::string GetId() OVERRIDE;
-  virtual bool WasCrashed() OVERRIDE;
-  virtual Status ConnectIfNecessary() OVERRIDE;
-  virtual Status HandleReceivedEvents() OVERRIDE;
-  virtual Status Load(const std::string& url) OVERRIDE;
-  virtual Status Reload() OVERRIDE;
+  virtual std::string GetId() override;
+  virtual bool WasCrashed() override;
+  virtual Status ConnectIfNecessary() override;
+  virtual Status HandleReceivedEvents() override;
+  virtual Status Load(const std::string& url) override;
+  virtual Status Reload() override;
   virtual Status EvaluateScript(const std::string& frame,
                                 const std::string& function,
-                                scoped_ptr<base::Value>* result) OVERRIDE;
+                                scoped_ptr<base::Value>* result) override;
   virtual Status CallFunction(const std::string& frame,
                               const std::string& function,
                               const base::ListValue& args,
-                              scoped_ptr<base::Value>* result) OVERRIDE;
+                              scoped_ptr<base::Value>* result) override;
   virtual Status CallAsyncFunction(const std::string& frame,
                                    const std::string& function,
                                    const base::ListValue& args,
                                    const base::TimeDelta& timeout,
-                                   scoped_ptr<base::Value>* result) OVERRIDE;
+                                   scoped_ptr<base::Value>* result) override;
   virtual Status CallUserAsyncFunction(
       const std::string& frame,
       const std::string& function,
       const base::ListValue& args,
       const base::TimeDelta& timeout,
-      scoped_ptr<base::Value>* result) OVERRIDE;
+      scoped_ptr<base::Value>* result) override;
   virtual Status GetFrameByFunction(const std::string& frame,
                                     const std::string& function,
                                     const base::ListValue& args,
-                                    std::string* out_frame) OVERRIDE;
+                                    std::string* out_frame) override;
   virtual Status DispatchMouseEvents(
-      const std::list<MouseEvent>& events, const std::string& frame) OVERRIDE;
-  virtual Status DispatchTouchEvent(const TouchEvent& event) OVERRIDE;
+      const std::list<MouseEvent>& events, const std::string& frame) override;
+  virtual Status DispatchTouchEvent(const TouchEvent& event) override;
   virtual Status DispatchTouchEvents(
-      const std::list<TouchEvent>& events) OVERRIDE;
-  virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) OVERRIDE;
-  virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) OVERRIDE;
+      const std::list<TouchEvent>& events) override;
+  virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) override;
+  virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) override;
   virtual Status DeleteCookie(const std::string& name,
-                              const std::string& url) OVERRIDE;
+                              const std::string& url) override;
   virtual Status WaitForPendingNavigations(const std::string& frame_id,
                                            const base::TimeDelta& timeout,
-                                           bool stop_load_on_timeout) OVERRIDE;
+                                           bool stop_load_on_timeout) override;
   virtual Status IsPendingNavigation(
-      const std::string& frame_id, bool* is_pending) OVERRIDE;
-  virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
-  virtual Status OverrideGeolocation(const Geoposition& geoposition) OVERRIDE;
-  virtual Status CaptureScreenshot(std::string* screenshot) OVERRIDE;
+      const std::string& frame_id, bool* is_pending) override;
+  virtual JavaScriptDialogManager* GetJavaScriptDialogManager() override;
+  virtual Status OverrideGeolocation(const Geoposition& geoposition) override;
+  virtual Status CaptureScreenshot(std::string* screenshot) override;
   virtual Status SetFileInputFiles(
       const std::string& frame,
       const base::DictionaryValue& element,
-      const std::vector<base::FilePath>& files) OVERRIDE;
-  virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) OVERRIDE;
-  virtual Status StartProfile() OVERRIDE;
-  virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) OVERRIDE;
+      const std::vector<base::FilePath>& files) override;
+  virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) override;
+  virtual Status StartProfile() override;
+  virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) override;
 
  private:
   std::string id_;
diff --git a/chrome/test/chromedriver/chrome/web_view_impl.h b/chrome/test/chromedriver/chrome/web_view_impl.h
index 06718b7..a9b4532 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl.h
+++ b/chrome/test/chromedriver/chrome/web_view_impl.h
@@ -45,58 +45,58 @@ class WebViewImpl : public WebView {
   virtual ~WebViewImpl();
 
   // Overridden from WebView:
-  virtual std::string GetId() OVERRIDE;
-  virtual bool WasCrashed() OVERRIDE;
-  virtual Status ConnectIfNecessary() OVERRIDE;
-  virtual Status HandleReceivedEvents() OVERRIDE;
-  virtual Status Load(const std::string& url) OVERRIDE;
-  virtual Status Reload() OVERRIDE;
+  virtual std::string GetId() override;
+  virtual bool WasCrashed() override;
+  virtual Status ConnectIfNecessary() override;
+  virtual Status HandleReceivedEvents() override;
+  virtual Status Load(const std::string& url) override;
+  virtual Status Reload() override;
   virtual Status EvaluateScript(const std::string& frame,
                                 const std::string& expression,
-                                scoped_ptr<base::Value>* result) OVERRIDE;
+                                scoped_ptr<base::Value>* result) override;
   virtual Status CallFunction(const std::string& frame,
                               const std::string& function,
                               const base::ListValue& args,
-                              scoped_ptr<base::Value>* result) OVERRIDE;
+                              scoped_ptr<base::Value>* result) override;
   virtual Status CallAsyncFunction(const std::string& frame,
                                    const std::string& function,
                                    const base::ListValue& args,
                                    const base::TimeDelta& timeout,
-                                   scoped_ptr<base::Value>* result) OVERRIDE;
+                                   scoped_ptr<base::Value>* result) override;
   virtual Status CallUserAsyncFunction(
       const std::string& frame,
       const std::string& function,
       const base::ListValue& args,
       const base::TimeDelta& timeout,
-      scoped_ptr<base::Value>* result) OVERRIDE;
+      scoped_ptr<base::Value>* result) override;
   virtual Status GetFrameByFunction(const std::string& frame,
                                     const std::string& function,
                                     const base::ListValue& args,
-                                    std::string* out_frame) OVERRIDE;
+                                    std::string* out_frame) override;
   virtual Status DispatchMouseEvents(
-      const std::list<MouseEvent>& events, const std::string& frame) OVERRIDE;
-  virtual Status DispatchTouchEvent(const TouchEvent& event) OVERRIDE;
+      const std::list<MouseEvent>& events, const std::string& frame) override;
+  virtual Status DispatchTouchEvent(const TouchEvent& event) override;
   virtual Status DispatchTouchEvents(
-      const std::list<TouchEvent>& events) OVERRIDE;
-  virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) OVERRIDE;
-  virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) OVERRIDE;
+      const std::list<TouchEvent>& events) override;
+  virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) override;
+  virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) override;
   virtual Status DeleteCookie(const std::string& name,
-                              const std::string& url) OVERRIDE;
+                              const std::string& url) override;
   virtual Status WaitForPendingNavigations(const std::string& frame_id,
                                            const base::TimeDelta& timeout,
-                                           bool stop_load_on_timeout) OVERRIDE;
+                                           bool stop_load_on_timeout) override;
   virtual Status IsPendingNavigation(
-      const std::string& frame_id, bool* is_pending) OVERRIDE;
-  virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
-  virtual Status OverrideGeolocation(const Geoposition& geoposition) OVERRIDE;
-  virtual Status CaptureScreenshot(std::string* screenshot) OVERRIDE;
+      const std::string& frame_id, bool* is_pending) override;
+  virtual JavaScriptDialogManager* GetJavaScriptDialogManager() override;
+  virtual Status OverrideGeolocation(const Geoposition& geoposition) override;
+  virtual Status CaptureScreenshot(std::string* screenshot) override;
   virtual Status SetFileInputFiles(
       const std::string& frame,
       const base::DictionaryValue& element,
-      const std::vector<base::FilePath>& files) OVERRIDE;
-  virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) OVERRIDE;
-  virtual Status StartProfile() OVERRIDE;
-  virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) OVERRIDE;
+      const std::vector<base::FilePath>& files) override;
+  virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) override;
+  virtual Status StartProfile() override;
+  virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) override;
 
  private:
   Status CallAsyncFunctionInternal(const std::string& frame,
diff --git a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
index cd952a7..9e6663a 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
+++ b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
@@ -29,35 +29,35 @@ class FakeDevToolsClient : public DevToolsClient {
   }
 
   // Overridden from DevToolsClient:
-  virtual const std::string& GetId() OVERRIDE {
+  virtual const std::string& GetId() override {
     return id_;
   }
-  virtual bool WasCrashed() OVERRIDE {
+  virtual bool WasCrashed() override {
     return false;
   }
-  virtual Status ConnectIfNecessary() OVERRIDE {
+  virtual Status ConnectIfNecessary() override {
     return Status(kOk);
   }
   virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE {
+                             const base::DictionaryValue& params) override {
     return SendCommandAndGetResult(method, params, NULL);
   }
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     if (status_.IsError())
       return status_;
     result->reset(result_.DeepCopy());
     return Status(kOk);
   }
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE {}
+  virtual void AddListener(DevToolsEventListener* listener) override {}
   virtual Status HandleEventsUntil(
       const ConditionalFunc& conditional_func,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     return Status(kOk);
   }
-  virtual Status HandleReceivedEvents() OVERRIDE {
+  virtual Status HandleReceivedEvents() override {
     return Status(kOk);
   }
 
diff --git a/chrome/test/chromedriver/command_listener_proxy.h b/chrome/test/chromedriver/command_listener_proxy.h
index 5788cae..dea8683 100644
--- a/chrome/test/chromedriver/command_listener_proxy.h
+++ b/chrome/test/chromedriver/command_listener_proxy.h
@@ -19,7 +19,7 @@ class CommandListenerProxy : public CommandListener {
   explicit CommandListenerProxy(CommandListener* command_listener);
 
   // Forwards commands to |command_listener_|.
-  virtual Status BeforeCommand(const std::string& command_name) OVERRIDE;
+  virtual Status BeforeCommand(const std::string& command_name) override;
 
  private:
   CommandListener* const command_listener_;
diff --git a/chrome/test/chromedriver/command_listener_proxy_unittest.cc b/chrome/test/chromedriver/command_listener_proxy_unittest.cc
index 937605c..1ecf246 100644
--- a/chrome/test/chromedriver/command_listener_proxy_unittest.cc
+++ b/chrome/test/chromedriver/command_listener_proxy_unittest.cc
@@ -17,7 +17,7 @@ class MockCommandListener : public CommandListener {
   MockCommandListener() : called_(false) {}
   virtual ~MockCommandListener() {}
 
-  virtual Status BeforeCommand(const std::string& command_name) OVERRIDE {
+  virtual Status BeforeCommand(const std::string& command_name) override {
     called_ = true;
     EXPECT_STREQ("cmd", command_name.c_str());
     return Status(kOk);
diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc
index 324c093..c953d19 100644
--- a/chrome/test/chromedriver/commands_unittest.cc
+++ b/chrome/test/chromedriver/commands_unittest.cc
@@ -295,7 +295,7 @@ class FindElementWebView : public StubWebView {
   virtual Status CallFunction(const std::string& frame,
                               const std::string& function,
                               const base::ListValue& args,
-                              scoped_ptr<base::Value>* result) OVERRIDE {
+                              scoped_ptr<base::Value>* result) override {
     ++current_count_;
     if (scenario_ == kElementExistsTimeout ||
         (scenario_ == kElementExistsQueryTwice && current_count_ == 1)) {
@@ -507,7 +507,7 @@ class ErrorCallFunctionWebView : public StubWebView {
   virtual Status CallFunction(const std::string& frame,
                               const std::string& function,
                               const base::ListValue& args,
-                              scoped_ptr<base::Value>* result) OVERRIDE {
+                              scoped_ptr<base::Value>* result) override {
     return Status(code_);
   }
 
@@ -555,7 +555,7 @@ class MockCommandListener : public CommandListener {
   MockCommandListener() : called_(false) {}
   virtual ~MockCommandListener() {}
 
-  virtual Status BeforeCommand(const std::string& command_name) OVERRIDE {
+  virtual Status BeforeCommand(const std::string& command_name) override {
     called_ = true;
     EXPECT_STREQ("cmd", command_name.c_str());
     return Status(kOk);
@@ -662,7 +662,7 @@ class FailingCommandListener : public CommandListener {
   FailingCommandListener() {}
   virtual ~FailingCommandListener() {}
 
-  virtual Status BeforeCommand(const std::string& command_name) OVERRIDE {
+  virtual Status BeforeCommand(const std::string& command_name) override {
     return Status(kUnknownError);
   }
 };
diff --git a/chrome/test/chromedriver/logging.h b/chrome/test/chromedriver/logging.h
index 32b3f8af..83b6d10 100644
--- a/chrome/test/chromedriver/logging.h
+++ b/chrome/test/chromedriver/logging.h
@@ -49,7 +49,7 @@ class WebDriverLog : public Log {
   virtual void AddEntryTimestamped(const base::Time& timestamp,
                                    Level level,
                                    const std::string& source,
-                                   const std::string& message) OVERRIDE;
+                                   const std::string& message) override;
 
   const std::string& type() const;
   void set_min_level(Level min_level);
diff --git a/chrome/test/chromedriver/net/net_util.cc b/chrome/test/chromedriver/net/net_util.cc
index 1d5270d..518c236 100644
--- a/chrome/test/chromedriver/net/net_util.cc
+++ b/chrome/test/chromedriver/net/net_util.cc
@@ -42,7 +42,7 @@ class SyncUrlFetcher : public net::URLFetcherDelegate {
     fetcher_->Start();
   }
 
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE {
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override {
     success_ = (source->GetResponseCode() == 200);
     if (success_)
       success_ = source->GetResponseAsString(response_);
diff --git a/chrome/test/chromedriver/net/net_util_unittest.cc b/chrome/test/chromedriver/net/net_util_unittest.cc
index 801620d..e06de3c 100644
--- a/chrome/test/chromedriver/net/net_util_unittest.cc
+++ b/chrome/test/chromedriver/net/net_util_unittest.cc
@@ -70,10 +70,10 @@ class FetchUrlTest : public testing::Test,
   }
 
   // Overridden from net::HttpServer::Delegate:
-  virtual void OnConnect(int connection_id) OVERRIDE {}
+  virtual void OnConnect(int connection_id) override {}
 
   virtual void OnHttpRequest(int connection_id,
-                             const net::HttpServerRequestInfo& info) OVERRIDE {
+                             const net::HttpServerRequestInfo& info) override {
     switch (response_) {
       case kSendHello:
         server_->Send200(connection_id, "hello", "text/plain");
@@ -91,10 +91,10 @@ class FetchUrlTest : public testing::Test,
 
   virtual void OnWebSocketRequest(
       int connection_id,
-      const net::HttpServerRequestInfo& info) OVERRIDE {}
+      const net::HttpServerRequestInfo& info) override {}
   virtual void OnWebSocketMessage(int connection_id,
-                                  const std::string& data) OVERRIDE {}
-  virtual void OnClose(int connection_id) OVERRIDE {}
+                                  const std::string& data) override {}
+  virtual void OnClose(int connection_id) override {}
 
  protected:
   enum ServerResponse {
diff --git a/chrome/test/chromedriver/net/sync_websocket_impl.h b/chrome/test/chromedriver/net/sync_websocket_impl.h
index e199768..4a424717 100644
--- a/chrome/test/chromedriver/net/sync_websocket_impl.h
+++ b/chrome/test/chromedriver/net/sync_websocket_impl.h
@@ -35,13 +35,13 @@ class SyncWebSocketImpl : public SyncWebSocket {
   virtual ~SyncWebSocketImpl();
 
   // Overridden from SyncWebSocket:
-  virtual bool IsConnected() OVERRIDE;
-  virtual bool Connect(const GURL& url) OVERRIDE;
-  virtual bool Send(const std::string& message) OVERRIDE;
+  virtual bool IsConnected() override;
+  virtual bool Connect(const GURL& url) override;
+  virtual bool Send(const std::string& message) override;
   virtual StatusCode ReceiveNextMessage(
       std::string* message,
-      const base::TimeDelta& timeout) OVERRIDE;
-  virtual bool HasNextMessage() OVERRIDE;
+      const base::TimeDelta& timeout) override;
+  virtual bool HasNextMessage() override;
 
  private:
   struct CoreTraits;
@@ -59,8 +59,8 @@ class SyncWebSocketImpl : public SyncWebSocket {
     bool HasNextMessage();
 
     // Overriden from WebSocketListener:
-    virtual void OnMessageReceived(const std::string& message) OVERRIDE;
-    virtual void OnClose() OVERRIDE;
+    virtual void OnMessageReceived(const std::string& message) override;
+    virtual void OnClose() override;
 
    private:
     friend class base::RefCountedThreadSafe<Core, CoreTraits>;
diff --git a/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc b/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
index 48cab8f..8572308 100644
--- a/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
+++ b/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
@@ -27,7 +27,7 @@ class SyncWebSocketImplTest : public testing::Test {
         long_timeout_(base::TimeDelta::FromMinutes(1)) {}
   virtual ~SyncWebSocketImplTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
     ASSERT_TRUE(client_thread_.StartWithOptions(options));
     context_getter_ = new URLRequestContextGetter(
@@ -35,7 +35,7 @@ class SyncWebSocketImplTest : public testing::Test {
     ASSERT_TRUE(server_.Start());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     server_.Stop();
   }
 
diff --git a/chrome/test/chromedriver/net/test_http_server.h b/chrome/test/chromedriver/net/test_http_server.h
index 70b26a5..f2b2913 100644
--- a/chrome/test/chromedriver/net/test_http_server.h
+++ b/chrome/test/chromedriver/net/test_http_server.h
@@ -61,15 +61,15 @@ class TestHttpServer : public net::HttpServer::Delegate {
   GURL web_socket_url() const;
 
   // Overridden from net::HttpServer::Delegate:
-  virtual void OnConnect(int connection_id) OVERRIDE;
+  virtual void OnConnect(int connection_id) override;
   virtual void OnHttpRequest(int connection_id,
-                             const net::HttpServerRequestInfo& info) OVERRIDE {}
+                             const net::HttpServerRequestInfo& info) override {}
   virtual void OnWebSocketRequest(
       int connection_id,
-      const net::HttpServerRequestInfo& info) OVERRIDE;
+      const net::HttpServerRequestInfo& info) override;
   virtual void OnWebSocketMessage(int connection_id,
-                                  const std::string& data) OVERRIDE;
-  virtual void OnClose(int connection_id) OVERRIDE;
+                                  const std::string& data) override;
+  virtual void OnClose(int connection_id) override;
 
  private:
   void StartOnServerThread(bool* success, base::WaitableEvent* event);
diff --git a/chrome/test/chromedriver/net/url_request_context_getter.h b/chrome/test/chromedriver/net/url_request_context_getter.h
index 23f7680..9495f74 100644
--- a/chrome/test/chromedriver/net/url_request_context_getter.h
+++ b/chrome/test/chromedriver/net/url_request_context_getter.h
@@ -25,9 +25,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
-  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const OVERRIDE;
+      GetNetworkTaskRunner() const override;
 
  private:
   virtual ~URLRequestContextGetter();
diff --git a/chrome/test/chromedriver/net/websocket_unittest.cc b/chrome/test/chromedriver/net/websocket_unittest.cc
index fd6299e..d032287 100644
--- a/chrome/test/chromedriver/net/websocket_unittest.cc
+++ b/chrome/test/chromedriver/net/websocket_unittest.cc
@@ -44,7 +44,7 @@ class Listener : public WebSocketListener {
     EXPECT_TRUE(messages_.empty());
   }
 
-  virtual void OnMessageReceived(const std::string& message) OVERRIDE {
+  virtual void OnMessageReceived(const std::string& message) override {
     ASSERT_TRUE(messages_.size());
     EXPECT_EQ(messages_[0], message);
     messages_.erase(messages_.begin());
@@ -52,7 +52,7 @@ class Listener : public WebSocketListener {
       base::MessageLoop::current()->Quit();
   }
 
-  virtual void OnClose() OVERRIDE {
+  virtual void OnClose() override {
     EXPECT_TRUE(false);
   }
 
@@ -69,9 +69,9 @@ class CloseListener : public WebSocketListener {
     EXPECT_FALSE(run_loop_);
   }
 
-  virtual void OnMessageReceived(const std::string& message) OVERRIDE {}
+  virtual void OnMessageReceived(const std::string& message) override {}
 
-  virtual void OnClose() OVERRIDE {
+  virtual void OnClose() override {
     EXPECT_TRUE(run_loop_);
     if (run_loop_)
       run_loop_->Quit();
@@ -87,11 +87,11 @@ class WebSocketTest : public testing::Test {
   WebSocketTest() {}
   virtual ~WebSocketTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(server_.Start());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     server_.Stop();
   }
 
diff --git a/chrome/test/chromedriver/performance_logger.h b/chrome/test/chromedriver/performance_logger.h
index 4ce17ca..a673832 100644
--- a/chrome/test/chromedriver/performance_logger.h
+++ b/chrome/test/chromedriver/performance_logger.h
@@ -39,19 +39,19 @@ class PerformanceLogger : public DevToolsEventListener, public CommandListener {
                     const PerfLoggingPrefs& prefs);
 
   // PerformanceLogger subscribes to browser-wide |DevToolsClient| for tracing.
-  virtual bool subscribes_to_browser() OVERRIDE;
+  virtual bool subscribes_to_browser() override;
 
   // For browser-wide client: enables tracing if trace categories are specified,
   // sets |browser_client_|. For other clients: calls EnableInspectorDomains.
-  virtual Status OnConnected(DevToolsClient* client) OVERRIDE;
+  virtual Status OnConnected(DevToolsClient* client) override;
 
   // Calls HandleInspectorEvents or HandleTraceEvents depending on client type.
   virtual Status OnEvent(DevToolsClient* client,
                          const std::string& method,
-                         const base::DictionaryValue& params) OVERRIDE;
+                         const base::DictionaryValue& params) override;
 
   // Before whitelisted commands, if tracing enabled, calls CollectTraceEvents.
-  virtual Status BeforeCommand(const std::string& command_name) OVERRIDE;
+  virtual Status BeforeCommand(const std::string& command_name) override;
 
  private:
   void AddLogEntry(Log::Level level,
diff --git a/chrome/test/chromedriver/performance_logger_unittest.cc b/chrome/test/chromedriver/performance_logger_unittest.cc
index badaa9d..51ebf1c 100644
--- a/chrome/test/chromedriver/performance_logger_unittest.cc
+++ b/chrome/test/chromedriver/performance_logger_unittest.cc
@@ -56,25 +56,25 @@ class FakeDevToolsClient : public StubDevToolsClient {
   }
 
   // Overridden from DevToolsClient:
-  virtual Status ConnectIfNecessary() OVERRIDE {
+  virtual Status ConnectIfNecessary() override {
     return listener_->OnConnected(this);
   }
 
   virtual Status SendCommandAndGetResult(
       const std::string& method,
       const base::DictionaryValue& params,
-      scoped_ptr<base::DictionaryValue>* result) OVERRIDE {
+      scoped_ptr<base::DictionaryValue>* result) override {
     sent_commands_.push_back(new DevToolsCommand(method,
                                                  params.DeepCopy()));
     return Status(kOk);
   }
 
-  virtual void AddListener(DevToolsEventListener* listener) OVERRIDE {
+  virtual void AddListener(DevToolsEventListener* listener) override {
     CHECK(!listener_);
     listener_ = listener;
   }
 
-  virtual const std::string& GetId() OVERRIDE {
+  virtual const std::string& GetId() override {
     return id_;
   }
 
@@ -103,7 +103,7 @@ class FakeLog : public Log {
   virtual void AddEntryTimestamped(const base::Time& timestamp,
                         Level level,
                         const std::string& source,
-                        const std::string& message) OVERRIDE;
+                        const std::string& message) override;
 
   const ScopedVector<LogEntry>& GetEntries() {
     return entries_;
@@ -262,7 +262,7 @@ class FakeBrowserwideClient : public FakeDevToolsClient {
   // Overridden from DevToolsClient:
   virtual Status HandleEventsUntil(
       const ConditionalFunc& conditional_func,
-      const base::TimeDelta& timeout) OVERRIDE {
+      const base::TimeDelta& timeout) override {
     TriggerEvent("Tracing.tracingComplete");
     events_handled_ = true;
     return Status(kOk);
diff --git a/chrome/test/chromedriver/server/chromedriver_server.cc b/chrome/test/chromedriver/server/chromedriver_server.cc
index 9772540..432d6ef 100644
--- a/chrome/test/chromedriver/server/chromedriver_server.cc
+++ b/chrome/test/chromedriver/server/chromedriver_server.cc
@@ -65,12 +65,12 @@ class HttpServer : public net::HttpServer::Delegate {
   }
 
   // Overridden from net::HttpServer::Delegate:
-  virtual void OnConnect(int connection_id) OVERRIDE {
+  virtual void OnConnect(int connection_id) override {
     server_->SetSendBufferSize(connection_id, kBufferSize);
     server_->SetReceiveBufferSize(connection_id, kBufferSize);
   }
   virtual void OnHttpRequest(int connection_id,
-                             const net::HttpServerRequestInfo& info) OVERRIDE {
+                             const net::HttpServerRequestInfo& info) override {
     handle_request_func_.Run(
         info,
         base::Bind(&HttpServer::OnResponse,
@@ -79,10 +79,10 @@ class HttpServer : public net::HttpServer::Delegate {
   }
   virtual void OnWebSocketRequest(
       int connection_id,
-      const net::HttpServerRequestInfo& info) OVERRIDE {}
+      const net::HttpServerRequestInfo& info) override {}
   virtual void OnWebSocketMessage(int connection_id,
-                                  const std::string& data) OVERRIDE {}
-  virtual void OnClose(int connection_id) OVERRIDE {}
+                                  const std::string& data) override {}
+  virtual void OnClose(int connection_id) override {}
 
  private:
   void OnResponse(int connection_id,
diff --git a/chrome/test/chromedriver/session_commands_unittest.cc b/chrome/test/chromedriver/session_commands_unittest.cc
index d25d9eb..0ca527d 100644
--- a/chrome/test/chromedriver/session_commands_unittest.cc
+++ b/chrome/test/chromedriver/session_commands_unittest.cc
@@ -50,7 +50,7 @@ class DetachChrome : public StubChrome {
   virtual ~DetachChrome() {}
 
   // Overridden from Chrome:
-  virtual Status Quit() OVERRIDE {
+  virtual Status Quit() override {
     quit_called_ = true;
     return Status(kOk);
   }
@@ -98,7 +98,7 @@ class FailsToQuitChrome : public StubChrome {
   virtual ~FailsToQuitChrome() {}
 
   // Overridden from Chrome:
-  virtual Status Quit() OVERRIDE {
+  virtual Status Quit() override {
     return Status(kUnknownError);
   }
 };
diff --git a/chrome/test/chromedriver/session_unittest.cc b/chrome/test/chromedriver/session_unittest.cc
index a9a73da..14485f5 100644
--- a/chrome/test/chromedriver/session_unittest.cc
+++ b/chrome/test/chromedriver/session_unittest.cc
@@ -19,7 +19,7 @@ class MockChrome : public StubChrome {
   virtual ~MockChrome() {}
 
   virtual Status GetWebViewById(const std::string& id,
-                                WebView** web_view) OVERRIDE {
+                                WebView** web_view) override {
     if (id == web_view_.GetId()) {
       *web_view = &web_view_;
       return Status(kOk);
diff --git a/chrome/test/data/webui/async_gen.h b/chrome/test/data/webui/async_gen.h
index ef96cc3..e8af827 100644
--- a/chrome/test/data/webui/async_gen.h
+++ b/chrome/test/data/webui/async_gen.h
@@ -30,7 +30,7 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
     void HandleCallJS(const base::ListValue* list_value);
 
     // WebUIMessageHandler implementation.
-    virtual void RegisterMessages() OVERRIDE;
+    virtual void RegisterMessages() override;
   };
 
   // Handler for this test fixture.
@@ -38,11 +38,11 @@ class WebUIBrowserAsyncGenTest : public WebUIBrowserTest {
 
  private:
   // Provide this object's handler.
-  virtual content::WebUIMessageHandler* GetMockMessageHandler() OVERRIDE {
+  virtual content::WebUIMessageHandler* GetMockMessageHandler() override {
     return &message_handler_;
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     WebUIBrowserTest::SetUpOnMainThread();
     EXPECT_CALL(message_handler_, HandleTearDown(::testing::_));
   }
diff --git a/chrome/test/data/webui/chrome_send_browsertest.h b/chrome/test/data/webui/chrome_send_browsertest.h
index e454765..a46077f 100644
--- a/chrome/test/data/webui/chrome_send_browsertest.h
+++ b/chrome/test/data/webui/chrome_send_browsertest.h
@@ -25,7 +25,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest {
     MOCK_METHOD1(HandleCheckSend, void(const base::ListValue*));
 
    private:
-    virtual void RegisterMessages() OVERRIDE;
+    virtual void RegisterMessages() override;
   };
 
 
@@ -34,7 +34,7 @@ class ChromeSendWebUITest : public WebUIBrowserTest {
   ::testing::StrictMock<ChromeSendWebUIMessageHandler> message_handler_;
 
  private:
-  virtual content::WebUIMessageHandler* GetMockMessageHandler() OVERRIDE;
+  virtual content::WebUIMessageHandler* GetMockMessageHandler() override;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSendWebUITest);
 };
@@ -47,7 +47,7 @@ class ChromeSendPassthroughWebUITest : public ChromeSendWebUITest {
   virtual ~ChromeSendPassthroughWebUITest();
 
  private:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSendPassthroughWebUITest);
 };
diff --git a/chrome/test/data/webui/history_ui_browsertest.h b/chrome/test/data/webui/history_ui_browsertest.h
index ded7fc4..6abf763 100644
--- a/chrome/test/data/webui/history_ui_browsertest.h
+++ b/chrome/test/data/webui/history_ui_browsertest.h
@@ -16,7 +16,7 @@ class HistoryUIBrowserTest : public WebUIBrowserTest {
   HistoryUIBrowserTest();
   virtual ~HistoryUIBrowserTest();
 
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
  protected:
   // Sets the pref to allow or prohibit deleting history entries.
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc
index f906aca..0700d83 100644
--- a/chrome/test/gpu/webgl_infobar_browsertest.cc
+++ b/chrome/test/gpu/webgl_infobar_browsertest.cc
@@ -53,7 +53,7 @@ void SimulateGPUCrash(Browser* browser) {
 
 class WebGLInfoBarTest : public InProcessBrowserTest {
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     base::FilePath test_dir;
     ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir));
     gpu_test_dir_ = test_dir.AppendASCII("gpu");
diff --git a/chrome/test/logging/win/log_file_printer.cc b/chrome/test/logging/win/log_file_printer.cc
index c22f6fa..d374ada 100644
--- a/chrome/test/logging/win/log_file_printer.cc
+++ b/chrome/test/logging/win/log_file_printer.cc
@@ -89,16 +89,16 @@ class EventPrinter : public logging_win::LogFileDelegate {
   explicit EventPrinter(std::ostream* out);
   virtual ~EventPrinter();
 
-  virtual void OnUnknownEvent(const EVENT_TRACE* event) OVERRIDE;
+  virtual void OnUnknownEvent(const EVENT_TRACE* event) override;
 
-  virtual void OnUnparsableEvent(const EVENT_TRACE* event) OVERRIDE;
+  virtual void OnUnparsableEvent(const EVENT_TRACE* event) override;
 
   virtual void OnFileHeader(const EVENT_TRACE* event,
-                            const TRACE_LOGFILE_HEADER* header) OVERRIDE;
+                            const TRACE_LOGFILE_HEADER* header) override;
 
   virtual void OnLogMessage(const EVENT_TRACE* event,
                             logging::LogSeverity severity,
-                            const base::StringPiece& message) OVERRIDE;
+                            const base::StringPiece& message) override;
 
   virtual void OnLogMessageFull(const EVENT_TRACE* event,
                                 logging::LogSeverity severity,
@@ -106,7 +106,7 @@ class EventPrinter : public logging_win::LogFileDelegate {
                                 const intptr_t* backtrace,
                                 int line,
                                 const base::StringPiece& file,
-                                const base::StringPiece& message) OVERRIDE;
+                                const base::StringPiece& message) override;
 
   virtual void OnTraceEvent(const EVENT_TRACE* event,
                             const base::StringPiece& name,
@@ -114,7 +114,7 @@ class EventPrinter : public logging_win::LogFileDelegate {
                             intptr_t id,
                             const base::StringPiece& extra,
                             DWORD stack_depth,
-                            const intptr_t* backtrace) OVERRIDE;
+                            const intptr_t* backtrace) override;
 
  private:
   void PrintTimeStamp(LARGE_INTEGER time_stamp);
diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc
index 4adfc87..3587e6a 100644
--- a/chrome/test/logging/win/test_log_collector.cc
+++ b/chrome/test/logging/win/test_log_collector.cc
@@ -54,32 +54,32 @@ class TestLogCollector {
 
     // Sets up the log collector.
     virtual void OnTestProgramStart(
-        const testing::UnitTest& unit_test) OVERRIDE {
+        const testing::UnitTest& unit_test) override {
       test_log_collector_->SetUp();
       default_result_printer_->OnTestProgramStart(unit_test);
     }
 
     virtual void OnTestIterationStart(const testing::UnitTest& unit_test,
-                                      int iteration) OVERRIDE {
+                                      int iteration) override {
       default_result_printer_->OnTestIterationStart(unit_test, iteration);
     }
 
     virtual void OnEnvironmentsSetUpStart(
-        const testing::UnitTest& unit_test) OVERRIDE {
+        const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsSetUpStart(unit_test);
     }
 
     virtual void OnEnvironmentsSetUpEnd(
-        const testing::UnitTest& unit_test) OVERRIDE {
+        const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsSetUpEnd(unit_test);
     }
 
-    virtual void OnTestCaseStart(const testing::TestCase& test_case) OVERRIDE {
+    virtual void OnTestCaseStart(const testing::TestCase& test_case) override {
       default_result_printer_->OnTestCaseStart(test_case);
     }
 
     // Calls back to the collector to start collecting logs for this test.
-    virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
+    virtual void OnTestStart(const testing::TestInfo& test_info) override {
       default_result_printer_->OnTestStart(test_info);
       test_log_collector_->StartSessionForTest(test_info);
     }
@@ -87,39 +87,39 @@ class TestLogCollector {
     // Calls back to the collector with the partial result.  If the collector
     // does not handle it, it is given to the default result printer.
     virtual void OnTestPartResult(
-        const testing::TestPartResult& test_part_result) OVERRIDE {
+        const testing::TestPartResult& test_part_result) override {
       if (!test_log_collector_->LogTestPartResult(test_part_result))
         default_result_printer_->OnTestPartResult(test_part_result);
     }
 
     // Calls back to the collector to handle the collected log for the test that
     // has just ended.
-    virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
+    virtual void OnTestEnd(const testing::TestInfo& test_info) override {
       test_log_collector_->ProcessSessionForTest(test_info);
       default_result_printer_->OnTestEnd(test_info);
     }
 
-    virtual void OnTestCaseEnd(const testing::TestCase& test_case) OVERRIDE {
+    virtual void OnTestCaseEnd(const testing::TestCase& test_case) override {
       default_result_printer_->OnTestCaseEnd(test_case);
     }
 
     virtual void OnEnvironmentsTearDownStart(
-        const testing::UnitTest& unit_test) OVERRIDE {
+        const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsTearDownStart(unit_test);
     }
 
     virtual void OnEnvironmentsTearDownEnd(
-        const testing::UnitTest& unit_test) OVERRIDE {
+        const testing::UnitTest& unit_test) override {
       default_result_printer_->OnEnvironmentsTearDownEnd(unit_test);
     }
 
     virtual void OnTestIterationEnd(const testing::UnitTest& unit_test,
-                                    int iteration) OVERRIDE {
+                                    int iteration) override {
       default_result_printer_->OnTestIterationEnd(unit_test, iteration);
     }
 
     // Tears down the log collector.
-    virtual void OnTestProgramEnd(const testing::UnitTest& unit_test) OVERRIDE {
+    virtual void OnTestProgramEnd(const testing::UnitTest& unit_test) override {
       default_result_printer_->OnTestProgramEnd(unit_test);
       test_log_collector_->TearDown();
     }
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index db9ccfe..53aa273 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -214,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, RelativeManifest) {
 // Test with the NaCl debug flag turned on.
 class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl {
  public:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     NaClBrowserTestPnacl::SetUpCommandLine(command_line);
     // Turn on debugging to influence the PNaCl URL loaded
     command_line->AppendSwitch(switches::kEnableNaClDebug);
@@ -278,7 +278,7 @@ class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl {
 // so that nothing is actually debugged.
 class NaClBrowserTestPnaclDebugMasked : public NaClBrowserTestPnaclDebug {
  public:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     NaClBrowserTestPnaclDebug::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kNaClDebugMask,
                                     "!<all_urls>");
diff --git a/chrome/test/nacl/nacl_browsertest_uma.cc b/chrome/test/nacl/nacl_browsertest_uma.cc
index e04670f..4e79e31 100644
--- a/chrome/test/nacl/nacl_browsertest_uma.cc
+++ b/chrome/test/nacl/nacl_browsertest_uma.cc
@@ -82,7 +82,7 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, {
 class NaClBrowserTestNewlibVcacheExtension:
       public NaClBrowserTestNewlibExtension {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE {
+  virtual base::FilePath::StringType Variant() override {
     return FILE_PATH_LITERAL("extension_vcache_test/newlib");
   }
 };
@@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibVcacheExtension,
 class NaClBrowserTestGLibcVcacheExtension:
       public NaClBrowserTestGLibcExtension {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE {
+  virtual base::FilePath::StringType Variant() override {
     return FILE_PATH_LITERAL("extension_vcache_test/glibc");
   }
 };
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc
index 461d9f0..64c066f 100644
--- a/chrome/test/nacl/nacl_browsertest_util.cc
+++ b/chrome/test/nacl/nacl_browsertest_util.cc
@@ -111,7 +111,7 @@ class NaClIntegrationMessageHandler : public StructuredMessageHandler {
 
   virtual MessageResponse HandleStructuredMessage(
       const std::string& type,
-      base::DictionaryValue* msg) OVERRIDE;
+      base::DictionaryValue* msg) override;
 
   bool test_passed() const {
     return test_passed_;
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 643d56e..b04e2e5 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -14,7 +14,7 @@
 // {"type": type_name, ...}
 class StructuredMessageHandler : public content::TestMessageHandler {
  public:
-  virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
+  virtual MessageResponse HandleMessage(const std::string& json) override;
 
   // This method provides a higher-level interface for handling JSON messages
   // from the DOM automation controler.  Instead of handling a string
@@ -45,7 +45,7 @@ class LoadTestMessageHandler : public StructuredMessageHandler {
 
   virtual MessageResponse HandleStructuredMessage(
       const std::string& type,
-      base::DictionaryValue* msg) OVERRIDE;
+      base::DictionaryValue* msg) override;
 
   bool test_passed() const {
     return test_passed_;
@@ -62,9 +62,9 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
   NaClBrowserTestBase();
   virtual ~NaClBrowserTestBase();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   // What variant are we running - newlib, glibc, pnacl, etc?
   // This is used to compute what directory we're pulling data from, but it can
@@ -109,38 +109,38 @@ class NaClBrowserTestBase : public InProcessBrowserTest {
 
 class NaClBrowserTestNewlib : public NaClBrowserTestBase {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
+  virtual base::FilePath::StringType Variant() override;
 };
 
 class NaClBrowserTestGLibc : public NaClBrowserTestBase {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
+  virtual base::FilePath::StringType Variant() override;
 };
 
 class NaClBrowserTestPnacl : public NaClBrowserTestBase {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
+  virtual base::FilePath::StringType Variant() override;
 
-  virtual bool IsAPnaclTest() OVERRIDE;
+  virtual bool IsAPnaclTest() override;
 };
 
 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual base::FilePath::StringType Variant() OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual base::FilePath::StringType Variant() override;
 };
 
 class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual base::FilePath::StringType Variant() OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual base::FilePath::StringType Variant() override;
 };
 
 // A NaCl browser test only using static files.
 class NaClBrowserTestStatic : public NaClBrowserTestBase {
  public:
-  virtual base::FilePath::StringType Variant() OVERRIDE;
-  virtual bool GetDocumentRoot(base::FilePath* document_root) OVERRIDE;
+  virtual base::FilePath::StringType Variant() override;
+  virtual bool GetDocumentRoot(base::FilePath* document_root) override;
 };
 
 // A NaCl browser test that loads from an unpacked chrome extension.
@@ -148,12 +148,12 @@ class NaClBrowserTestStatic : public NaClBrowserTestBase {
 // the tester's document root.
 class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // PNaCl tests take a long time on windows debug builds
diff --git a/chrome/test/nacl/pnacl_header_test.h b/chrome/test/nacl/pnacl_header_test.h
index 6c75fdc..1c67df3 100644
--- a/chrome/test/nacl/pnacl_header_test.h
+++ b/chrome/test/nacl/pnacl_header_test.h
@@ -36,7 +36,7 @@ class TestDispatcherHostDelegate : public ResourceDispatcherHostDelegate {
       content::ResourceContext* resource_context,
       content::AppCacheService* appcache_service,
       content::ResourceType resource_type,
-      ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
+      ScopedVector<content::ResourceThrottle>* throttles) override;
 
   bool found_pnacl_header() const { return found_pnacl_header_; }
 
diff --git a/chrome/test/perf/browser_perf_test.h b/chrome/test/perf/browser_perf_test.h
index 250724c..44e7e68 100644
--- a/chrome/test/perf/browser_perf_test.h
+++ b/chrome/test/perf/browser_perf_test.h
@@ -18,7 +18,7 @@ class BrowserPerfTest : public InProcessBrowserTest {
 
   // Set up common browser perf test flags. Typically call down to this if
   // overridden.
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // Prints IO performance data for use by perf graphs.
   void PrintIOPerfInfo(const std::string& test_name);
diff --git a/chrome/test/perf/mach_ports_performancetest.cc b/chrome/test/perf/mach_ports_performancetest.cc
index e80b943..c05ea58 100644
--- a/chrome/test/perf/mach_ports_performancetest.cc
+++ b/chrome/test/perf/mach_ports_performancetest.cc
@@ -30,13 +30,13 @@ class MachPortsTest : public InProcessBrowserTest {
                 base::FilePath(FILE_PATH_LITERAL("data/mach_ports/moz"))) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     InProcessBrowserTest::SetUp();
 
     ASSERT_TRUE(server_.Start());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     std::string ports;
     for (std::vector<int>::iterator it = port_counts_.begin();
          it != port_counts_.end(); ++it) {
diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
index 9d6c209..8d71b50 100644
--- a/chrome/test/ppapi/ppapi_test.h
+++ b/chrome/test/ppapi/ppapi_test.h
@@ -21,8 +21,8 @@ class PPAPITestMessageHandler : public content::TestMessageHandler {
  public:
   PPAPITestMessageHandler();
 
-  virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
-  virtual void Reset() OVERRIDE;
+  virtual MessageResponse HandleMessage(const std::string& json) override;
+  virtual void Reset() override;
 
   const std::string& message() const {
     return message_;
@@ -39,9 +39,9 @@ class PPAPITestBase : public InProcessBrowserTest {
   PPAPITestBase();
 
   // InProcessBrowserTest:
-  virtual void SetUp() OVERRIDE;
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
 
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) = 0;
@@ -68,7 +68,7 @@ class PPAPITestBase : public InProcessBrowserTest {
     // content::NotificationObserver:
     virtual void Observe(int type,
                          const content::NotificationSource& source,
-                         const content::NotificationDetails& details) OVERRIDE;
+                         const content::NotificationDetails& details) override;
 
     void VerifyInfoBarState();
 
@@ -94,17 +94,17 @@ class PPAPITest : public PPAPITestBase {
  public:
   PPAPITest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
  protected:
   bool in_process_;  // Controls the --ppapi-in-process switch.
 };
 
 class PPAPIPrivateTest : public PPAPITest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // Variant of PPAPITest that runs plugins out-of-process to test proxy
@@ -113,65 +113,65 @@ class OutOfProcessPPAPITest : public PPAPITest {
  public:
   OutOfProcessPPAPITest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for Newlib runtime.
 class PPAPINaClTest : public PPAPITestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
   // PPAPITestBase overrides.
-  virtual void RunTest(const std::string& test_case) OVERRIDE;
-  virtual void RunTestViaHTTP(const std::string& test_case) OVERRIDE;
-  virtual void RunTestWithSSLServer(const std::string& test_case) OVERRIDE;
+  virtual void RunTest(const std::string& test_case) override;
+  virtual void RunTestViaHTTP(const std::string& test_case) override;
+  virtual void RunTestWithSSLServer(const std::string& test_case) override;
   virtual void RunTestWithWebSocketServer(
-      const std::string& test_case) OVERRIDE;
+      const std::string& test_case) override;
   virtual void RunTestIfAudioOutputAvailable(
-      const std::string& test_case) OVERRIDE;
+      const std::string& test_case) override;
   virtual void RunTestViaHTTPIfAudioOutputAvailable(
-      const std::string& test_case) OVERRIDE;
+      const std::string& test_case) override;
 };
 
 // NaCl plugin test runner for Newlib runtime.
 class PPAPINaClNewlibTest : public PPAPINaClTest {
  public:
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClNewlibTest : public PPAPINaClNewlibTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for GNU-libc runtime.
 class PPAPINaClGLibcTest : public PPAPINaClTest {
  public:
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClGLibcTest : public PPAPINaClGLibcTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // NaCl plugin test runner for the PNaCl + Newlib runtime.
 class PPAPINaClPNaClTest : public PPAPINaClTest {
  public:
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClPNaClTest : public PPAPINaClPNaClTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 // Test Non-SFI Mode, using PNaCl toolchain to produce nexes.
@@ -180,26 +180,26 @@ class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
   virtual void SetUpCommandLine(base::CommandLine* command_line);
 
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
 };
 
 class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 };
 
 class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
  public:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
+                                 const std::string& test_case) override;
 };
 
 class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
  public:
   // PPAPITestBase override:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 };
 
 #endif  // CHROME_TEST_PPAPI_PPAPI_TEST_H_
diff --git a/chrome/test/remoting/remote_desktop_browsertest.h b/chrome/test/remoting/remote_desktop_browsertest.h
index e4a025e..22fa2d8 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.h
+++ b/chrome/test/remoting/remote_desktop_browsertest.h
@@ -54,15 +54,15 @@ class RemoteDesktopBrowserTest : public extensions::PlatformAppBrowserTest {
   virtual ~RemoteDesktopBrowserTest();
 
   // InProcessBrowserTest Overrides
-  virtual void SetUp() OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void SetUpOnMainThread() override;
 
  protected:
   // InProcessBrowserTest Overrides
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
+  virtual void SetUpInProcessBrowserTestFixture() override;
 
   // InProcessBrowserTest Overrides
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
+  virtual void TearDownInProcessBrowserTestFixture() override;
 
   // The following helpers each perform a simple task.
 
diff --git a/chrome/test/remoting/waiter.h b/chrome/test/remoting/waiter.h
index c4a1d5a..82fe937 100644
--- a/chrome/test/remoting/waiter.h
+++ b/chrome/test/remoting/waiter.h
@@ -52,10 +52,10 @@ class ConditionalTimeoutWaiter : public TimeoutWaiter {
   virtual ~ConditionalTimeoutWaiter();
 
   // Returns true if |callback_| returned true and false in case of timeout.
-  virtual bool Wait() OVERRIDE;
+  virtual bool Wait() override;
 
  protected:
-  virtual void CancelWait() OVERRIDE;
+  virtual void CancelWait() override;
 
  private:
   // Callback used to cancel the ConditionalTimeoutWaiter::Wait.