Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 631013003: Replacing the OVERRIDE with override and FINAL with final in content/browser/frame_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 0dc0bc9788db3e5971218142c5380f718e4aeaf5..36b9eedd49fb0c0b44655ddd41b3de9a117c172f 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -59,24 +59,24 @@ class RenderFrameHostManagerTestWebUIControllerFactory
// WebUIFactory implementation.
virtual WebUIController* CreateWebUIControllerForURL(
- WebUI* web_ui, const GURL& url) const OVERRIDE {
+ WebUI* web_ui, const GURL& url) const override {
if (!(should_create_webui_ && HasWebUIScheme(url)))
return NULL;
return new WebUIController(web_ui);
}
virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ const GURL& url) const override {
return WebUI::kNoWebUI;
}
virtual bool UseWebUIForURL(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ const GURL& url) const override {
return HasWebUIScheme(url);
}
virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ const GURL& url) const override {
return HasWebUIScheme(url);
}
@@ -93,7 +93,7 @@ class BeforeUnloadFiredWebContentsDelegate : public WebContentsDelegate {
virtual void BeforeUnloadFired(WebContents* web_contents,
bool proceed,
- bool* proceed_to_fire_unload) OVERRIDE {
+ bool* proceed_to_fire_unload) override {
*proceed_to_fire_unload = proceed;
}
@@ -112,7 +112,7 @@ class RenderViewHostDeletedObserver : public WebContentsObserver {
deleted_(false) {
}
- virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE {
+ virtual void RenderViewDeleted(RenderViewHost* render_view_host) override {
if (render_view_host->GetProcess()->GetID() == process_id_ &&
render_view_host->GetRoutingID() == routing_id_) {
deleted_ = true;
@@ -142,7 +142,7 @@ class RenderFrameHostDeletedObserver : public WebContentsObserver {
deleted_(false) {
}
- virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE {
+ virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
if (render_frame_host->GetProcess()->GetID() == process_id_ &&
render_frame_host->GetRoutingID() == routing_id_) {
deleted_ = true;
@@ -175,12 +175,12 @@ class PluginFaviconMessageObserver : public WebContentsObserver {
favicon_received_(false) { }
virtual void PluginCrashed(const base::FilePath& plugin_path,
- base::ProcessId plugin_pid) OVERRIDE {
+ base::ProcessId plugin_pid) override {
plugin_crashed_ = true;
}
virtual void DidUpdateFaviconURL(
- const std::vector<FaviconURL>& candidates) OVERRIDE {
+ const std::vector<FaviconURL>& candidates) override {
favicon_received_ = true;
}
@@ -209,7 +209,7 @@ class FrameLifetimeConsistencyChecker : public WebContentsObserver {
RenderFrameCreated(web_contents->GetMainFrame());
}
- virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE {
+ virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) override {
std::pair<int, int> routing_pair =
std::make_pair(render_frame_host->GetProcess()->GetID(),
render_frame_host->GetRoutingID());
@@ -225,7 +225,7 @@ class FrameLifetimeConsistencyChecker : public WebContentsObserver {
}
}
- virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE {
+ virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) override {
std::pair<int, int> routing_pair =
std::make_pair(render_frame_host->GetProcess()->GetID(),
render_frame_host->GetRoutingID());
@@ -259,13 +259,13 @@ class FrameLifetimeConsistencyChecker : public WebContentsObserver {
class RenderFrameHostManagerTest
: public RenderViewHostImplTestHarness {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
RenderViewHostImplTestHarness::SetUp();
WebUIControllerFactory::RegisterFactory(&factory_);
lifetime_checker_.reset(new FrameLifetimeConsistencyChecker(contents()));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
lifetime_checker_.reset();
RenderViewHostImplTestHarness::TearDown();
WebUIControllerFactory::UnregisterFactoryForTesting(&factory_);
@@ -670,7 +670,7 @@ class RenderViewHostDestroyer : public WebContentsObserver {
web_contents_(web_contents) {}
virtual void RenderViewDeleted(
- RenderViewHost* render_view_host) OVERRIDE {
+ RenderViewHost* render_view_host) override {
if (render_view_host == render_view_host_)
delete web_contents_;
}

Powered by Google App Engine
This is Rietveld 408576698