summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 16:19:10 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 16:19:10 +0000
commitbcefe0fd673ffe73a4f1c26669d3b8551314fd89 (patch)
tree70095b459cc826704247586ab4e8281c944520c5 /chrome/browser/net
parent51b95502776e23711259722219e3afde9318ee4a (diff)
downloadchromium_src-bcefe0fd673ffe73a4f1c26669d3b8551314fd89.zip
chromium_src-bcefe0fd673ffe73a4f1c26669d3b8551314fd89.tar.gz
chromium_src-bcefe0fd673ffe73a4f1c26669d3b8551314fd89.tar.bz2
Reland 65535
Group Policy support for HTTP authentication, already had LGTM from http://codereview.chromium.org/3517018. BUG=53625 TEST=ConfigurationPolicyPrefStore* Review URL: http://codereview.chromium.org/4733003 Patch from Jakob Kummerow <jkummerow@google.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/connection_tester_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 4191484..af505d8 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,8 @@ 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),
+ io_thread_(new TestingPrefService()) {
scoped_refptr<net::RuleBasedHostResolverProc> catchall_resolver(
new net::RuleBasedHostResolverProc(NULL));