summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/proxy/network_delegate_error_observer_unittest.cc6
-rw-r--r--net/proxy/proxy_resolver_error_observer.h1
-rw-r--r--net/proxy/proxy_service.cc3
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() {