Revert 51877, since SpdyNetworkTransactionTest.CorruptFrameSessionError start...

net/proxy/sync_host_resolver_bridge_unittest.cc

 // Copyright (c) 2010 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 "net/proxy/sync_host_resolver_bridge.h"
 
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
-#include "net/proxy/multi_threaded_proxy_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// TODO(eroman): This test should be moved into
-//               multi_threaded_proxy_resolver_unittest.cc.
-
 namespace net {
 
 namespace {
 
 // This implementation of HostResolver allows blocking until a resolve request
 // has been received. The resolve requests it receives will never be completed.
 class BlockableHostResolver : public HostResolver {
  public:
   BlockableHostResolver()
       : event_(true, false),
@@ skipping 42 matching lines @@
  private:
   // Event to notify when a resolve request was received.
   base::WaitableEvent event_;
   bool was_request_cancelled_;
 };
 
 // This implementation of ProxyResolver simply does a synchronous resolve
 // on |host_resolver| in response to GetProxyForURL().
 class SyncProxyResolver : public ProxyResolver {
  public:
-  explicit SyncProxyResolver(SyncHostResolverBridge* host_resolver)
+  explicit SyncProxyResolver(HostResolver* host_resolver)
       : ProxyResolver(false), host_resolver_(host_resolver) {}
 
   virtual int GetProxyForURL(const GURL& url,
                              ProxyInfo* results,
                              CompletionCallback* callback,
                              RequestHandle* request,
                              const BoundNetLog& net_log) {
     EXPECT_FALSE(callback);
     EXPECT_FALSE(request);
 
     // Do a synchronous host resolve.
     HostResolver::RequestInfo info(url.host(), 80);
     AddressList addresses;
     int rv =
         host_resolver_->Resolve(info, &addresses, NULL, NULL, BoundNetLog());
 
     EXPECT_EQ(ERR_ABORTED, rv);
 
     return rv;
   }
 
   virtual void CancelRequest(RequestHandle request) {
     NOTREACHED();
   }
 
-  virtual void Shutdown() {
-    host_resolver_->Shutdown();
-  }
-
  private:
   virtual int SetPacScript(const GURL& pac_url,
                            const string16& pac_script,
                            CompletionCallback* callback) {
+    NOTREACHED();
     return OK;
   }
 
-  scoped_refptr<SyncHostResolverBridge> host_resolver_;
-};
-
-class SyncProxyResolverFactory : public ProxyResolverFactory {
- public:
-  explicit SyncProxyResolverFactory(SyncHostResolverBridge* sync_host_resolver)
-      : ProxyResolverFactory(false),
-        sync_host_resolver_(sync_host_resolver) {
-  }
-
-  virtual ProxyResolver* CreateProxyResolver() {
-    return new SyncProxyResolver(sync_host_resolver_);
-  }
-
- private:
-  scoped_refptr<SyncHostResolverBridge> sync_host_resolver_;
+  scoped_refptr<HostResolver> host_resolver_;
 };
 
 // This helper thread is used to create the circumstances for the deadlock.
 // It is analagous to the "IO thread" which would be main thread running the
 // network stack.
 class IOThread : public base::Thread {
  public:
   IOThread() : base::Thread("IO-thread") {}
 
   virtual ~IOThread() {
     Stop();
   }
 
   const scoped_refptr<BlockableHostResolver>& async_resolver() {
     return async_resolver_;
   }
 
  protected:
   virtual void Init() {
     async_resolver_ = new BlockableHostResolver();
 
     // Create a synchronous host resolver that operates the async host
     // resolver on THIS thread.
     scoped_refptr<SyncHostResolverBridge> sync_resolver =
         new SyncHostResolverBridge(async_resolver_, message_loop());
 
     proxy_resolver_.reset(
-        new MultiThreadedProxyResolver(
-            new SyncProxyResolverFactory(sync_resolver),
-            1u));
-
-    // Initialize the resolver.
-    TestCompletionCallback callback;
-    proxy_resolver_->SetPacScriptByUrl(GURL(), &callback);
-    EXPECT_EQ(OK, callback.WaitForResult());
+        new SingleThreadedProxyResolverUsingBridgedHostResolver(
+            new SyncProxyResolver(sync_resolver),
+            sync_resolver));
 
     // Start an asynchronous request to the proxy resolver
     // (note that it will never complete).
     proxy_resolver_->GetProxyForURL(GURL("http://test/"), &results_,
                                     &callback_, &request_, BoundNetLog());
   }
 
   virtual void CleanUp() {
     // Cancel the outstanding request (note however that this will not
     // unblock the PAC thread though).
@@ skipping 18 matching lines @@
 
   // Data for the outstanding request to the single threaded proxy resolver.
   TestCompletionCallback callback_;
   ProxyInfo results_;
   ProxyResolver::RequestHandle request_;
 };
 
 // Test that a deadlock does not happen during shutdown when a host resolve
 // is outstanding on the SyncHostResolverBridge.
 // This is a regression test for http://crbug.com/41244.
-TEST(MultiThreadedProxyResolverTest, ShutdownIsCalledBeforeThreadJoin) {
+TEST(SingleThreadedProxyResolverWithBridgedHostResolverTest, ShutdownDeadlock) {
   IOThread io_thread;
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   ASSERT_TRUE(io_thread.StartWithOptions(options));
 
   io_thread.async_resolver()->WaitUntilRequestIsReceived();
 
   // Now upon exitting this scope, the IOThread is destroyed -- this will
   // stop the IOThread, which will in turn delete the
   // SingleThreadedProxyResolver, which in turn will stop its internal
   // PAC thread (which is currently blocked waiting on the host resolve which
   // is running on IOThread).  The IOThread::Cleanup() will verify that after
   // the PAC thread is stopped, it cancels the request on the HostResolver.
 }
 
 }  // namespace
 
 }  // namespace net