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

Unified Diff: content/browser/devtools/devtools_manager_unittest.cc

Issue 634483005: Replacing the OVERRIDE with override and FINAL with final in content/browser/[devtools/ssl] (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/devtools/devtools_manager_unittest.cc
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index c730ea328488d20f23a2cd68239056f0c5e53f9f..0c34f2352739f1936b1c6ca8a7803735c0c331e3 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -48,12 +48,12 @@ class TestDevToolsClientHost : public DevToolsAgentHostClient {
}
virtual void AgentHostClosed(
- DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
+ DevToolsAgentHost* agent_host, bool replaced) override {
FAIL();
}
virtual void DispatchProtocolMessage(
- DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
+ DevToolsAgentHost* agent_host, const std::string& message) override {
last_sent_message = &message;
}
@@ -87,7 +87,7 @@ class TestWebContentsDelegate : public WebContentsDelegate {
TestWebContentsDelegate() : renderer_unresponsive_received_(false) {}
// Notification that the contents is hung.
- virtual void RendererUnresponsive(WebContents* source) OVERRIDE {
+ virtual void RendererUnresponsive(WebContents* source) override {
renderer_unresponsive_received_ = true;
}
@@ -105,24 +105,24 @@ class TestTarget : public DevToolsTarget {
: agent_host_(agent_host) {}
virtual ~TestTarget() {}
- virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
- virtual std::string GetParentId() const OVERRIDE { return std::string(); }
- virtual std::string GetType() const OVERRIDE { return std::string(); }
- virtual std::string GetTitle() const OVERRIDE {
+ virtual std::string GetId() const override { return agent_host_->GetId(); }
+ virtual std::string GetParentId() const override { return std::string(); }
+ virtual std::string GetType() const override { return std::string(); }
+ virtual std::string GetTitle() const override {
return agent_host_->GetTitle();
}
- virtual std::string GetDescription() const OVERRIDE { return std::string(); }
- virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
- virtual GURL GetFaviconURL() const OVERRIDE { return GURL(); }
- virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+ virtual std::string GetDescription() const override { return std::string(); }
+ virtual GURL GetURL() const override { return agent_host_->GetURL(); }
+ virtual GURL GetFaviconURL() const override { return GURL(); }
+ virtual base::TimeTicks GetLastActivityTime() const override {
return base::TimeTicks();
}
- virtual bool IsAttached() const OVERRIDE { return agent_host_->IsAttached(); }
- virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+ virtual bool IsAttached() const override { return agent_host_->IsAttached(); }
+ virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
return agent_host_;
}
- virtual bool Activate() const OVERRIDE { return agent_host_->Activate(); }
- virtual bool Close() const OVERRIDE { return agent_host_->Close(); }
+ virtual bool Activate() const override { return agent_host_->Activate(); }
+ virtual bool Close() const override { return agent_host_->Close(); }
private:
scoped_refptr<DevToolsAgentHost> agent_host_;
@@ -133,20 +133,20 @@ class TestDevToolsManagerDelegate : public DevToolsManagerDelegate {
virtual ~TestDevToolsManagerDelegate() {}
virtual void Inspect(BrowserContext* browser_context,
- DevToolsAgentHost* agent_host) OVERRIDE {}
+ DevToolsAgentHost* agent_host) override {}
virtual void DevToolsAgentStateChanged(DevToolsAgentHost* agent_host,
- bool attached) OVERRIDE {}
+ bool attached) override {}
virtual base::DictionaryValue* HandleCommand(
DevToolsAgentHost* agent_host,
- base::DictionaryValue* command) OVERRIDE { return NULL; }
+ base::DictionaryValue* command) override { return NULL; }
- virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) OVERRIDE {
+ virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) override {
return scoped_ptr<DevToolsTarget>();
}
- virtual void EnumerateTargets(TargetCallback callback) OVERRIDE {
+ virtual void EnumerateTargets(TargetCallback callback) override {
TargetList result;
DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
for (DevToolsAgentHost::List::iterator it = agents.begin();
@@ -159,7 +159,7 @@ class TestDevToolsManagerDelegate : public DevToolsManagerDelegate {
callback.Run(result);
}
- virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE {
+ virtual std::string GetPageThumbnailData(const GURL& url) override {
return std::string();
}
};
@@ -168,7 +168,7 @@ class ContentBrowserClientWithDevTools : public TestContentBrowserClient {
public:
virtual ~ContentBrowserClientWithDevTools() {}
virtual content::DevToolsManagerDelegate*
- GetDevToolsManagerDelegate() OVERRIDE {
+ GetDevToolsManagerDelegate() override {
return new TestDevToolsManagerDelegate();
}
};
@@ -184,7 +184,7 @@ class TestDevToolsManagerObserver : public DevToolsManager::Observer {
return hosts_;
}
- virtual void TargetListChanged(const TargetList& targets) OVERRIDE {
+ virtual void TargetListChanged(const TargetList& targets) override {
updates_count_++;
hosts_.clear();
for (TargetList::const_iterator it = targets.begin();
@@ -206,13 +206,13 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
: old_browser_client_(NULL) {}
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
RenderViewHostImplTestHarness::SetUp();
TestDevToolsClientHost::ResetCounters();
old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
SetBrowserClientForTesting(old_browser_client_);
RenderViewHostImplTestHarness::TearDown();
}
@@ -319,15 +319,15 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
EXPECT_EQ(count, event_counter_[name]);
}
- virtual void Attach(DevToolsExternalAgentProxy* proxy) OVERRIDE {
+ virtual void Attach(DevToolsExternalAgentProxy* proxy) override {
recordEvent("Attach");
};
- virtual void Detach() OVERRIDE {
+ virtual void Detach() override {
recordEvent("Detach");
};
- virtual void SendMessageToBackend(const std::string& message) OVERRIDE {
+ virtual void SendMessageToBackend(const std::string& message) override {
recordEvent(std::string("SendMessageToBackend.") + message);
};
« no previous file with comments | « content/browser/devtools/devtools_http_handler_unittest.cc ('k') | content/browser/devtools/devtools_netlog_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698