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

Unified Diff: content/browser/resolve_proxy_msg_helper_unittest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch 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/resolve_proxy_msg_helper_unittest.cc
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index 023fe43567a24a41d3fc053e1bf0c2742f709e2c..3ddac3538aa72642eb001d86790235a3696b6ce8 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -18,10 +18,10 @@ namespace content {
// This ProxyConfigService always returns "http://pac" as the PAC url to use.
class MockProxyConfigService : public net::ProxyConfigService {
public:
- virtual void AddObserver(Observer* observer) OVERRIDE {}
- virtual void RemoveObserver(Observer* observer) OVERRIDE {}
+ virtual void AddObserver(Observer* observer) override {}
+ virtual void RemoveObserver(Observer* observer) override {}
virtual ConfigAvailability GetLatestProxyConfig(
- net::ProxyConfig* results) OVERRIDE {
+ net::ProxyConfig* results) override {
*results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac"));
return CONFIG_VALID;
}
@@ -34,7 +34,7 @@ class TestResolveProxyMsgHelper : public ResolveProxyMsgHelper {
IPC::Listener* listener)
: ResolveProxyMsgHelper(proxy_service),
listener_(listener) {}
- virtual bool Send(IPC::Message* message) OVERRIDE {
+ virtual bool Send(IPC::Message* message) override {
listener_->OnMessageReceived(*message);
delete message;
return true;
@@ -87,7 +87,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
scoped_ptr<PendingResult> pending_result_;
private:
- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
+ virtual bool OnMessageReceived(const IPC::Message& msg) override {
TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple reply_data;
EXPECT_TRUE(ViewHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data));
DCHECK(!pending_result_.get());
« no previous file with comments | « content/browser/resolve_proxy_msg_helper.h ('k') | content/browser/screen_orientation/screen_orientation_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698