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

Unified Diff: chrome/browser/net/resolve_proxy_msg_helper_unittest.cc

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 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
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/resolve_proxy_msg_helper_unittest.cc
===================================================================
--- chrome/browser/net/resolve_proxy_msg_helper_unittest.cc (revision 22399)
+++ chrome/browser/net/resolve_proxy_msg_helper_unittest.cc (working copy)
@@ -44,7 +44,11 @@
NOTREACHED();
}
- virtual void SetPacScriptByUrlInternal(const GURL& pac_url) {}
+ virtual int SetPacScript(const GURL& /*pac_url*/,
+ const std::string& /*bytes*/,
+ net::CompletionCallback* /*callback*/) {
+ return net::OK;
+ }
void Block() {
is_blocked_ = true;
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698