diff options
Diffstat (limited to 'content/browser/resolve_proxy_msg_helper_unittest.cc')
-rw-r--r-- | content/browser/resolve_proxy_msg_helper_unittest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc index 3ddac35..1a19018 100644 --- a/content/browser/resolve_proxy_msg_helper_unittest.cc +++ b/content/browser/resolve_proxy_msg_helper_unittest.cc @@ -18,10 +18,9 @@ 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 ConfigAvailability GetLatestProxyConfig( - net::ProxyConfig* results) override { + void AddObserver(Observer* observer) override {} + void RemoveObserver(Observer* observer) override {} + ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* results) override { *results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac")); return CONFIG_VALID; } @@ -34,14 +33,14 @@ class TestResolveProxyMsgHelper : public ResolveProxyMsgHelper { IPC::Listener* listener) : ResolveProxyMsgHelper(proxy_service), listener_(listener) {} - virtual bool Send(IPC::Message* message) override { + bool Send(IPC::Message* message) override { listener_->OnMessageReceived(*message); delete message; return true; } protected: - virtual ~TestResolveProxyMsgHelper() {} + ~TestResolveProxyMsgHelper() override {} IPC::Listener* listener_; }; @@ -87,7 +86,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener { scoped_ptr<PendingResult> pending_result_; private: - virtual bool OnMessageReceived(const IPC::Message& msg) override { + 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()); |