Merge Chromium at r66597: Initial merge by git.

Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b

1 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 4191484..5bab81e 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/net/connection_tester.h"
 
 #include "chrome/browser/io_thread.h"
+#include "chrome/test/testing_pref_service.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -75,7 +76,9 @@ class ConnectionTesterTest : public PlatformTest {
   ConnectionTesterTest()
       : test_server_(net::TestServer::TYPE_HTTP,
             FilePath(FILE_PATH_LITERAL("net/data/url_request_unittest"))),
-        message_loop_(MessageLoop::TYPE_IO) {
+        message_loop_(MessageLoop::TYPE_IO),
+        pref_service(new TestingPrefService()),
+        io_thread_(pref_service.get()) {
     scoped_refptr<net::RuleBasedHostResolverProc> catchall_resolver(
         new net::RuleBasedHostResolverProc(NULL));
 
@@ -89,6 +92,7 @@ class ConnectionTesterTest : public PlatformTest {
   net::TestServer test_server_;
   ConnectionTesterDelegate test_delegate_;
   MessageLoop message_loop_;
+  scoped_ptr<PrefService> pref_service;
   IOThread io_thread_;  // Needed for creating ProxyScriptFetchers.
 };