Add a MockAsyncProxyResolverFactory and update some tests to use it.

net/proxy/multi_threaded_proxy_resolver_unittest.cc

Index: net/proxy/multi_threaded_proxy_resolver_unittest.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 618aa14869ea334df202908facd619e108ec3c61..deeeb9208b85326f4085a17af86502acaa15ea9a 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -173,9 +173,8 @@ class BlockableProxyResolverFactory : public LegacyProxyResolverFactory {
 
 TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
   const size_t kNumThreads = 1u;
-  scoped_ptr<MockProxyResolver> mock(new MockProxyResolver);
-  MultiThreadedProxyResolver resolver(
-      new ForwardingProxyResolverFactory(mock.get()), kNumThreads);
+  BlockableProxyResolverFactory* factory = new BlockableProxyResolverFactory;
+  MultiThreadedProxyResolver resolver(factory, kNumThreads);
 
   int rv;
 
@@ -189,8 +188,9 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
       set_script_callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_EQ(OK, set_script_callback.WaitForResult());
+  ASSERT_EQ(1u, factory->resolvers().size());
   EXPECT_EQ(ASCIIToUTF16("pac script bytes"),
-            mock->last_script_data()->utf16());
+            factory->resolvers()[0]->last_script_data()->utf16());
 
   // Start request 0.
   TestCompletionCallback callback0;
@@ -256,9 +256,8 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_Basic) {
 TEST(MultiThreadedProxyResolverTest,
      SingleThread_UpdatesNetLogWithThreadWait) {
   const size_t kNumThreads = 1u;
-  scoped_ptr<BlockableProxyResolver> mock(new BlockableProxyResolver);
-  MultiThreadedProxyResolver resolver(
-      new ForwardingProxyResolverFactory(mock.get()), kNumThreads);
+  BlockableProxyResolverFactory* factory = new BlockableProxyResolverFactory;
+  MultiThreadedProxyResolver resolver(factory, kNumThreads);
 
   int rv;
 
@@ -268,6 +267,9 @@ TEST(MultiThreadedProxyResolverTest,
                              init_callback.callback());
   EXPECT_EQ(OK, init_callback.WaitForResult());
 
+  ASSERT_EQ(1u, factory->resolvers().size());
+  BlockableProxyResolver* mock = factory->resolvers()[0];
+
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
@@ -349,10 +351,8 @@ TEST(MultiThreadedProxyResolverTest,
 // is pending.
 TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
   const size_t kNumThreads = 1u;
-  scoped_ptr<BlockableProxyResolver> mock(new BlockableProxyResolver);
-  MultiThreadedProxyResolver resolver(
-      new ForwardingProxyResolverFactory(mock.get()),
-                                      kNumThreads);
+  BlockableProxyResolverFactory* factory = new BlockableProxyResolverFactory;
+  MultiThreadedProxyResolver resolver(factory, kNumThreads);
 
   int rv;
 
@@ -362,6 +362,9 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
                              init_callback.callback());
   EXPECT_EQ(OK, init_callback.WaitForResult());
 
+  ASSERT_EQ(1u, factory->resolvers().size());
+  BlockableProxyResolver* mock = factory->resolvers()[0];
+
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
@@ -426,10 +429,9 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
 // outstanding cancels them (and doesn't leak anything).
 TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequestByDeleting) {
   const size_t kNumThreads = 1u;
-  scoped_ptr<BlockableProxyResolver> mock(new BlockableProxyResolver);
+  BlockableProxyResolverFactory* factory = new BlockableProxyResolverFactory;
   scoped_ptr<MultiThreadedProxyResolver> resolver(
-      new MultiThreadedProxyResolver(
-          new ForwardingProxyResolverFactory(mock.get()), kNumThreads));
+      new MultiThreadedProxyResolver(factory, kNumThreads));
 
   int rv;
 
@@ -439,6 +441,9 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequestByDeleting) {
                               init_callback.callback());
   EXPECT_EQ(OK, init_callback.WaitForResult());
 
+  ASSERT_EQ(1u, factory->resolvers().size());
+  BlockableProxyResolver* mock = factory->resolvers()[0];
+
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
@@ -489,9 +494,8 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelRequestByDeleting) {
 // Cancel an outstanding call to SetPacScriptByData().
 TEST(MultiThreadedProxyResolverTest, SingleThread_CancelSetPacScript) {
   const size_t kNumThreads = 1u;
-  scoped_ptr<BlockableProxyResolver> mock(new BlockableProxyResolver);
-  MultiThreadedProxyResolver resolver(
-      new ForwardingProxyResolverFactory(mock.get()), kNumThreads);
+  BlockableProxyResolverFactory* factory = new BlockableProxyResolverFactory;
+  MultiThreadedProxyResolver resolver(factory, kNumThreads);
 
   int rv;
 
@@ -500,6 +504,8 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelSetPacScript) {
                              set_pac_script_callback.callback());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
+  EXPECT_EQ(1u, factory->resolvers().size());
+
   // Cancel the SetPacScriptByData request.
   resolver.CancelSetPacScript();
 
@@ -513,7 +519,9 @@ TEST(MultiThreadedProxyResolverTest, SingleThread_CancelSetPacScript) {
 
   rv = set_pac_script_callback2.WaitForResult();
   EXPECT_EQ(0, rv);
-  EXPECT_EQ(ASCIIToUTF16("data2"), mock->last_script_data()->utf16());
+  ASSERT_EQ(2u, factory->resolvers().size());
+  EXPECT_EQ(ASCIIToUTF16("data2"),
+            factory->resolvers()[1]->last_script_data()->utf16());
 
   // The first SetPacScript callback should never have been completed.
   EXPECT_FALSE(set_pac_script_callback.have_result());