diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 19:09:50 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-03 19:09:50 +0000 |
| commit | c7ced8643903da72e0c2d4922fef1d1392fe85c5 (patch) | |
| tree | b635e0024716bdcd88439a27481e9975c8a35b4c /net/proxy | |
| parent | 70a2ffadf12bfc42fe722c8db9f8ac7135bafd01 (diff) | |
| download | chromium_src-c7ced8643903da72e0c2d4922fef1d1392fe85c5.zip chromium_src-c7ced8643903da72e0c2d4922fef1d1392fe85c5.tar.gz chromium_src-c7ced8643903da72e0c2d4922fef1d1392fe85c5.tar.bz2 | |
Initialize the network_delegate_ and fix style
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6912029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/network_delegate_error_observer_unittest.cc | 6 | ||||
| -rw-r--r-- | net/proxy/proxy_resolver_error_observer.h | 1 | ||||
| -rw-r--r-- | net/proxy/proxy_service.cc | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/net/proxy/network_delegate_error_observer_unittest.cc b/net/proxy/network_delegate_error_observer_unittest.cc index b54a11a..736f717 100644 --- a/net/proxy/network_delegate_error_observer_unittest.cc +++ b/net/proxy/network_delegate_error_observer_unittest.cc @@ -61,7 +61,8 @@ TEST(NetworkDelegateErrorObserverTest, CallOnThread) { TestNetworkDelegate network_delegate; NetworkDelegateErrorObserver observer(&network_delegate, MessageLoop::current()); - thread.message_loop()->PostTask(FROM_HERE, + thread.message_loop()->PostTask( + FROM_HERE, NewRunnableMethod(&observer, &NetworkDelegateErrorObserver::OnPACScriptError, 42, string16())); @@ -75,7 +76,8 @@ TEST(NetworkDelegateErrorObserverTest, NoDelegate) { base::Thread thread("test_thread"); thread.Start(); NetworkDelegateErrorObserver observer(NULL, MessageLoop::current()); - thread.message_loop()->PostTask(FROM_HERE, + thread.message_loop()->PostTask( + FROM_HERE, NewRunnableMethod(&observer, &NetworkDelegateErrorObserver::OnPACScriptError, 42, string16())); diff --git a/net/proxy/proxy_resolver_error_observer.h b/net/proxy/proxy_resolver_error_observer.h index ddb0694..10c5106 100644 --- a/net/proxy/proxy_resolver_error_observer.h +++ b/net/proxy/proxy_resolver_error_observer.h @@ -6,6 +6,7 @@ #define NET_PROXY_PROXY_RESOLVER_ERROR_OBSERVER_H_ #pragma once +#include "base/basictypes.h" #include "base/string16.h" namespace net { diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 15ad381..f5b1417 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -174,7 +174,8 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory { : ProxyResolverFactory(true /*expects_pac_bytes*/), async_host_resolver_(async_host_resolver), io_loop_(io_loop), - net_log_(net_log) { + net_log_(net_log), + network_delegate_(network_delegate) { } virtual ProxyResolver* CreateProxyResolver() { |