[DevTools] Split DevToolsHttpHandler into two classes

content/browser/devtools/devtools_http_handler_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 "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 33 matching lines @@
     *address = net::IPEndPoint(number, kDummyPort);
     return net::OK;
   }
 
   int Accept(scoped_ptr<net::StreamSocket>* socket,
              const net::CompletionCallback& callback) override {
     return net::ERR_IO_PENDING;
   }
 };
 
+void NoOp() {
+}
+
+void QuitFromUI(const base::Closure& quit_closure) {
+  BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
+                                  base::Bind(&NoOp),
+                                  quit_closure);
+}
+
+void QuitFromHandlerThread(const base::Closure& quit_closure) {
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(&QuitFromUI, quit_closure));
+}
+
 class DummyServerSocketFactory
     : public DevToolsHttpHandler::ServerSocketFactory {
  public:
   DummyServerSocketFactory(base::Closure quit_closure_1,
                            base::Closure quit_closure_2)
       : DevToolsHttpHandler::ServerSocketFactory("", 0, 0),
         quit_closure_1_(quit_closure_1),
         quit_closure_2_(quit_closure_2) {}
 
   ~DummyServerSocketFactory() override {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, quit_closure_2_);
   }
 
- private:
+ protected:
   scoped_ptr<net::ServerSocket> Create() const override {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE, quit_closure_1_);
+    base::MessageLoopProxy::current()->PostTask(FROM_HERE,
+        base::Bind(&QuitFromHandlerThread, quit_closure_1_));
     return scoped_ptr<net::ServerSocket>(new DummyServerSocket());
   }
 
   base::Closure quit_closure_1_;
   base::Closure quit_closure_2_;
 };
 
+class FailingServerSocketFactory : public DummyServerSocketFactory {
+ public:
+  FailingServerSocketFactory(const base::Closure& quit_closure_1,
+                             const base::Closure& quit_closure_2)
+      : DummyServerSocketFactory(quit_closure_1, quit_closure_2) {
+  }
+
+ private:
+  scoped_ptr<net::ServerSocket> Create() const override {
+    base::MessageLoopProxy::current()->PostTask(FROM_HERE,

[dgozman, 2014/11/06 14:46:22]

Can we use RunAllPendingInMessageLoop for all the threads instead of this
error-prone thread-hopping?

[vkuzkokov, 2014/11/06 15:46:06]

Done.

+        base::Bind(&QuitFromHandlerThread, quit_closure_1_));
+    return nullptr;
+  }
+};
+
 class DummyDelegate : public DevToolsHttpHandlerDelegate {
  public:
   std::string GetDiscoveryPageHTML() override { return std::string(); }
 
   bool BundlesFrontendResources() override { return true; }
 
   base::FilePath GetDebugFrontendDir() override { return base::FilePath(); }
 
   scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
@@ skipping 22 matching lines @@
   base::MessageLoopForIO message_loop_;
   BrowserThreadImpl ui_thread_;
   scoped_ptr<BrowserThreadImpl> file_thread_;
 };
 
 TEST_F(DevToolsHttpHandlerTest, TestStartStop) {
   base::RunLoop run_loop, run_loop_2;
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new DummyServerSocketFactory(run_loop.QuitClosure(),
                                    run_loop_2.QuitClosure()));
-  content::DevToolsHttpHandler* devtools_http_handler_ =
+  content::DevToolsHttpHandler* devtools_http_handler =
       content::DevToolsHttpHandler::Start(factory.Pass(),
                                           std::string(),
                                           new DummyDelegate(),
                                           base::FilePath());
   // Our dummy socket factory will post a quit message once the server will
   // become ready.
   run_loop.Run();
-  devtools_http_handler_->Stop();
+  devtools_http_handler->Stop();
   // Make sure the handler actually stops.
   run_loop_2.Run();
 }
 
+TEST_F(DevToolsHttpHandlerTest, TestServerSocketFailed) {
+  base::RunLoop run_loop, run_loop_2;
+  scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
+      new FailingServerSocketFactory(run_loop.QuitClosure(),
+                                     run_loop_2.QuitClosure()));
+  content::DevToolsHttpHandler* devtools_http_handler =
+      content::DevToolsHttpHandler::Start(factory.Pass(),
+                                          std::string(),
+                                          new DummyDelegate(),
+                                          base::FilePath());
+  // Our dummy socket factory will post a quit message once the server will
+  // become ready.
+  run_loop.Run();
+  devtools_http_handler->Stop();
+  // Make sure the handler actually stops.
+  run_loop_2.Run();
+}
+
+
 TEST_F(DevToolsHttpHandlerTest, TestDevToolsActivePort) {
   base::RunLoop run_loop, run_loop_2;
   base::ScopedTempDir temp_dir;
   EXPECT_TRUE(temp_dir.CreateUniqueTempDir());
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new DummyServerSocketFactory(run_loop.QuitClosure(),
                                    run_loop_2.QuitClosure()));
-  content::DevToolsHttpHandler* devtools_http_handler_ =
+  content::DevToolsHttpHandler* devtools_http_handler =
       content::DevToolsHttpHandler::Start(factory.Pass(),
                                           std::string(),
                                           new DummyDelegate(),
                                           temp_dir.path());
   // Our dummy socket factory will post a quit message once the server will
   // become ready.
   run_loop.Run();
-  devtools_http_handler_->Stop();
+  devtools_http_handler->Stop();
   // Make sure the handler actually stops.
   run_loop_2.Run();
 
   // Now make sure the DevToolsActivePort was written into the
   // temporary directory and its contents are as expected.
   base::FilePath active_port_file = temp_dir.path().Append(
       kDevToolsActivePortFileName);
   EXPECT_TRUE(base::PathExists(active_port_file));
   std::string file_contents;
   EXPECT_TRUE(base::ReadFileToString(active_port_file, &file_contents));
   int port = 0;
   EXPECT_TRUE(base::StringToInt(file_contents, &port));
   EXPECT_EQ(kDummyPort, port);
 }
 
 }  // namespace content