summaryrefslogtreecommitdiffstats
path: root/content/browser/resolve_proxy_msg_helper_unittest.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
commitc3e3589c3e2dd1bc2e80d708fd49414376b2da8e (patch)
treeb024190741fb05211f5d8f600bb93c0237b0eed3 /content/browser/resolve_proxy_msg_helper_unittest.cc
parent3b22093c5ea7fd343be8d40f6e229ca7e4eaef8c (diff)
downloadchromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.zip
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.gz
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, content/ edition.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 Review URL: https://chromiumcodereview.appspot.com/12210030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resolve_proxy_msg_helper_unittest.cc')
-rw-r--r--content/browser/resolve_proxy_msg_helper_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index 512e611..f0d1c2d 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -18,9 +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) {}
- virtual void RemoveObserver(Observer* observer) {}
- virtual ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* results) {
+ virtual void AddObserver(Observer* observer) OVERRIDE {}
+ virtual void RemoveObserver(Observer* observer) OVERRIDE {}
+ virtual ConfigAvailability GetLatestProxyConfig(
+ net::ProxyConfig* results) OVERRIDE {
*results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac"));
return CONFIG_VALID;
}
@@ -69,7 +70,7 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
scoped_ptr<PendingResult> pending_result_;
private:
- virtual bool OnMessageReceived(const IPC::Message& msg) {
+ 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());