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

Side by Side Diff: net/proxy/mock_proxy_resolver.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_PROXY_MOCK_PROXY_RESOLVER_H_ 5 #ifndef NET_PROXY_MOCK_PROXY_RESOLVER_H_
6 #define NET_PROXY_MOCK_PROXY_RESOLVER_H_ 6 #define NET_PROXY_MOCK_PROXY_RESOLVER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 typedef std::vector<scoped_refptr<Request> > RequestsList; 71 typedef std::vector<scoped_refptr<Request> > RequestsList;
72 72
73 virtual ~MockAsyncProxyResolverBase(); 73 virtual ~MockAsyncProxyResolverBase();
74 74
75 // ProxyResolver implementation. 75 // ProxyResolver implementation.
76 virtual int GetProxyForURL(const GURL& url, 76 virtual int GetProxyForURL(const GURL& url,
77 ProxyInfo* results, 77 ProxyInfo* results,
78 const net::CompletionCallback& callback, 78 const net::CompletionCallback& callback,
79 RequestHandle* request_handle, 79 RequestHandle* request_handle,
80 const BoundNetLog& /*net_log*/) OVERRIDE; 80 const BoundNetLog& /*net_log*/) override;
81 virtual void CancelRequest(RequestHandle request_handle) OVERRIDE; 81 virtual void CancelRequest(RequestHandle request_handle) override;
82 virtual LoadState GetLoadState(RequestHandle request_handle) const OVERRIDE; 82 virtual LoadState GetLoadState(RequestHandle request_handle) const override;
83 virtual int SetPacScript( 83 virtual int SetPacScript(
84 const scoped_refptr<ProxyResolverScriptData>& script_data, 84 const scoped_refptr<ProxyResolverScriptData>& script_data,
85 const net::CompletionCallback& callback) OVERRIDE; 85 const net::CompletionCallback& callback) override;
86 virtual void CancelSetPacScript() OVERRIDE; 86 virtual void CancelSetPacScript() override;
87 87
88 const RequestsList& pending_requests() const { 88 const RequestsList& pending_requests() const {
89 return pending_requests_; 89 return pending_requests_;
90 } 90 }
91 91
92 const RequestsList& cancelled_requests() const { 92 const RequestsList& cancelled_requests() const {
93 return cancelled_requests_; 93 return cancelled_requests_;
94 } 94 }
95 95
96 SetPacScriptRequest* pending_set_pac_script_request() const; 96 SetPacScriptRequest* pending_set_pac_script_request() const;
(...skipping 23 matching lines...) Expand all
120 120
121 class MockAsyncProxyResolverExpectsBytes : public MockAsyncProxyResolverBase { 121 class MockAsyncProxyResolverExpectsBytes : public MockAsyncProxyResolverBase {
122 public: 122 public:
123 MockAsyncProxyResolverExpectsBytes() 123 MockAsyncProxyResolverExpectsBytes()
124 : MockAsyncProxyResolverBase(true /*expects_pac_bytes*/) {} 124 : MockAsyncProxyResolverBase(true /*expects_pac_bytes*/) {}
125 }; 125 };
126 126
127 } // namespace net 127 } // namespace net
128 128
129 #endif // NET_PROXY_MOCK_PROXY_RESOLVER_H_ 129 #endif // NET_PROXY_MOCK_PROXY_RESOLVER_H_
OLDNEW
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc ('k') | net/proxy/mock_proxy_script_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698