Replacing the OVERRIDE with override and FINAL with final in content/browser/frame_host

content/browser/frame_host/navigation_controller_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 84 matching lines @@
     if (!encoding_screenshot_in_progress_)
       return;
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
   }
 
  private:
   // Overridden from content::NavigationEntryScreenshotManager:
   virtual void TakeScreenshotImpl(
       content::RenderViewHost* host,
-      content::NavigationEntryImpl* entry) OVERRIDE {
+      content::NavigationEntryImpl* entry) override {
   }
 
-  virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) OVERRIDE {
+  virtual void OnScreenshotSet(content::NavigationEntryImpl* entry) override {
     encoding_screenshot_in_progress_ = false;
     NavigationEntryScreenshotManager::OnScreenshotSet(entry);
     if (message_loop_runner_.get())
       message_loop_runner_->Quit();
   }
 
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   bool encoding_screenshot_in_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(MockScreenshotManager);
@@ skipping 62 matching lines @@
 
 // NavigationControllerTest ----------------------------------------------------
 
 class NavigationControllerTest
     : public RenderViewHostImplTestHarness,
       public WebContentsObserver {
  public:
   NavigationControllerTest() : navigation_entry_committed_counter_(0) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
     WebContents* web_contents = RenderViewHostImplTestHarness::web_contents();
     ASSERT_TRUE(web_contents);  // The WebContents should be created by now.
     WebContentsObserver::Observe(web_contents);
   }
 
   // WebContentsObserver:
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      NavigationController::ReloadType reload_type) OVERRIDE {
+      NavigationController::ReloadType reload_type) override {
     navigated_url_ = url;
   }
 
   virtual void NavigationEntryCommitted(
-      const LoadCommittedDetails& load_details) OVERRIDE {
+      const LoadCommittedDetails& load_details) override {
     navigation_entry_committed_counter_++;
   }
 
   const GURL& navigated_url() const {
     return navigated_url_;
   }
 
   NavigationControllerImpl& controller_impl() {
     return static_cast<NavigationControllerImpl&>(controller());
   }
@@ skipping 24 matching lines @@
   int navigation_state_change_count() {
     return navigation_state_change_count_;
   }
 
   int repost_form_warning_count() {
     return repost_form_warning_count_;
   }
 
   // Keep track of whether the tab has notified us of a navigation state change.
   virtual void NavigationStateChanged(const WebContents* source,
-                                      InvalidateTypes changed_flags) OVERRIDE {
+                                      InvalidateTypes changed_flags) override {
     navigation_state_change_count_++;
   }
 
-  virtual void ShowRepostFormWarningDialog(WebContents* source) OVERRIDE {
+  virtual void ShowRepostFormWarningDialog(WebContents* source) override {
     repost_form_warning_count_++;
   }
 
  private:
   // The number of times NavigationStateChanged has been called.
   int navigation_state_change_count_;
 
   // The number of times ShowRepostFormWarningDialog() was called.
   int repost_form_warning_count_;
 };
@@ skipping 2021 matching lines @@
 class PrunedListener : public NotificationObserver {
  public:
   explicit PrunedListener(NavigationControllerImpl* controller)
       : notification_count_(0) {
     registrar_.Add(this, NOTIFICATION_NAV_LIST_PRUNED,
                    Source<NavigationController>(controller));
   }
 
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details) OVERRIDE {
+                       const NotificationDetails& details) override {
     if (type == NOTIFICATION_NAV_LIST_PRUNED) {
       notification_count_++;
       details_ = *(Details<PrunedDetails>(details).ptr());
     }
   }
 
   // Number of times NAV_LIST_PRUNED has been observed.
   int notification_count_;
 
   // Details from the last NAV_LIST_PRUNED.
@@ skipping 2046 matching lines @@
   params.post_id = -1;
   test_rvh()->SendNavigateWithParams(&params);
 
   // Now reload. replaceState overrides the POST, so we should not show a
   // repost warning dialog.
   controller_impl().Reload(true);
   EXPECT_EQ(0, delegate->repost_form_warning_count());
 }
 
 }  // namespace content