[net] Switch TestURLRequestContext to use MockCachingHostResolver.

jingle/notifier/base/proxy_resolving_client_socket_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/notifier/base/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
+#include "net/proxy/proxy_service.h"
 #include "net/socket/socket_test_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-class ProxyTestURLRequestContextGetter : public TestURLRequestContextGetter {
+class MyTestURLRequestContext : public TestURLRequestContext {
  public:
-  ProxyTestURLRequestContextGetter()
-      : TestURLRequestContextGetter(base::MessageLoopProxy::current()),
-        set_context_members_(false) {}
-
-  // Override GetURLRequestContext to set the host resolver and proxy
-  // service (used by the unit tests).
-  virtual TestURLRequestContext* GetURLRequestContext() OVERRIDE {
-    TestURLRequestContext* context =
-        TestURLRequestContextGetter::GetURLRequestContext();
-    if (!set_context_members_) {
-      context->set_host_resolver(new net::MockHostResolver());
-      context->set_proxy_service(net::ProxyService::CreateFixedFromPacResult(
-          "PROXY bad:99; PROXY maybe:80; DIRECT"));
-      set_context_members_ = true;
-    }
-    return context;
+  MyTestURLRequestContext() : TestURLRequestContext(true) {
+    context_storage_.set_proxy_service(
+        net::ProxyService::CreateFixedFromPacResult(
+            "PROXY bad:99; PROXY maybe:80; DIRECT"));
+    Init();
   }
-
- protected:
-  virtual ~ProxyTestURLRequestContextGetter() {}
-
- private:
-  bool set_context_members_;
+  virtual ~MyTestURLRequestContext() {}
 };
 
 }  // namespace
 
 namespace notifier {
 
 class ProxyResolvingClientSocketTest : public testing::Test {
  protected:
   ProxyResolvingClientSocketTest()
-      : url_request_context_getter_(new ProxyTestURLRequestContextGetter()) {}
+      : url_request_context_getter_(new TestURLRequestContextGetter(
+            base::MessageLoopProxy::current(),
+            scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext))) {}
 
   virtual ~ProxyResolvingClientSocketTest() {}
 
   virtual void TearDown() {
     // Clear out any messages posted by ProxyResolvingClientSocket's
     // destructor.
     message_loop_.RunAllPending();
   }
 
   MessageLoop message_loop_;
-  scoped_refptr<ProxyTestURLRequestContextGetter> url_request_context_getter_;
+  scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_;
 };
 
 // TODO(sanjeevr): Fix this test on Linux.
 TEST_F(ProxyResolvingClientSocketTest, DISABLED_ConnectError) {
   net::HostPortPair dest("0.0.0.0", 0);
   ProxyResolvingClientSocket proxy_resolving_socket(
       NULL,
       url_request_context_getter_,
       net::SSLConfig(),
       dest);
@@ skipping 46 matching lines @@
   const net::ProxyRetryInfoMap& retry_info =
       context->proxy_service()->proxy_retry_info();
 
   EXPECT_EQ(1u, retry_info.size());
   net::ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99");
   EXPECT_TRUE(iter != retry_info.end());
 }
 
 // TODO(sanjeevr): Add more unit-tests.
 }  // namespace notifier