diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
| commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
| tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /chrome/browser/net | |
| parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
| download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 | |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/net/resolve_proxy_msg_helper_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 351107a..a33716e 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -187,7 +187,7 @@ ChromeURLRequestContext::ChromeURLRequestContext(Profile* profile) user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir(); prefs_->AddPrefObserver(prefs::kAcceptLanguages, this); - prefs_->AddPrefObserver(prefs::kCookieBehavior, this); + prefs_->AddPrefObserver(prefs::kCookieBehavior, this); NotificationService::current()->AddObserver( this, NotificationType::EXTENSIONS_LOADED, diff --git a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc index a1b8d70..7dba1db 100644 --- a/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc +++ b/chrome/browser/net/resolve_proxy_msg_helper_unittest.cc @@ -36,7 +36,7 @@ class MockProxyResolver : public net::ProxyResolver { results->UseNamedProxy(query_url.host()); return net::OK; } - + void Block() { is_blocked_ = true; event_.Reset(); @@ -78,7 +78,7 @@ struct ResultFuture { bool TimedWaitUntilDone(const base::TimeDelta& max_time) { return completed_.TimedWait(max_time); } - + // These fields are only valid after returning from WaitUntilDone(). IPC::Message* reply_msg; int error_code; |