Replacing the OVERRIDE with override and FINAL with final in content/browser/geolocation/web_conten…

content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/frame_messages.h"
@@ skipping 44 matching lines @@
     // offset -1  on layer_delegate_.
     delete GetOverlay()->CreateBackLayer();
     // Performs BACK navigation, sets image from layer_delegate_ on
     // image_delegate_.
     GetOverlay()->OnWindowSlideCompleting();
     GetOverlay()->OnWindowSlideCompleted(scoped_ptr<ui::Layer>());
   }
 
  protected:
   // RenderViewHostImplTestHarness:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
 
     const GURL first("https://www.google.com");
     contents()->NavigateAndCommit(first);
     EXPECT_TRUE(controller().GetVisibleEntry());
     EXPECT_FALSE(controller().CanGoBack());
 
     const GURL second("http://www.chromium.org");
     contents()->NavigateAndCommit(second);
     EXPECT_TRUE(controller().CanGoBack());
@@ skipping 20 matching lines @@
           root_window()));
 
     overlay_->SetOverlayWindow(overlay_window.Pass(), image_delegate);
     overlay_->StartObserving();
 
     EXPECT_TRUE(overlay_->web_contents());
     EXPECT_FALSE(overlay_->loading_complete_);
     EXPECT_FALSE(overlay_->received_paint_update_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     overlay_.reset();
     RenderViewHostImplTestHarness::TearDown();
   }
 
   OverscrollNavigationOverlay* GetOverlay() {
     return overlay_.get();
   }
 
  private:
   scoped_ptr<OverscrollNavigationOverlay> overlay_;
@@ skipping 68 matching lines @@
   // (which can happen if a new navigation is performed while while a GestureNav
   // navigation is in progress).
   contents()->TestSetIsLoading(true);
   contents()->TestSetIsLoading(false);
   EXPECT_TRUE(GetOverlay()->loading_complete_);
 
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 }  // namespace content