GTTF: Make EmbeddedTestServer always use its own thread for IO

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 96 matching lines @@
 
  private:
   virtual ~LocalHostResolverProc() {}
 };
 
 }  // namespace
 
 extern int BrowserMain(const MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase()
-    : embedded_test_server_io_thread_("EmbeddedTestServer io thread"),
-      allow_test_contexts_(true),
+    : allow_test_contexts_(true),
       allow_osmesa_(true) {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::PowerMonitorDeviceSource::AllocateSystemIOPorts();
 #endif
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
 
-  // Create a separate thread for the test server to run on. It's tempting to
-  // use actual browser threads, but that doesn't work for cases where the test
-  // server needs to be started before the browser, for example when the server
-  // URL should be passed in command-line parameters.
-  base::Thread::Options thread_options;
-  thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
-  CHECK(embedded_test_server_io_thread_.StartWithOptions(thread_options));
-  embedded_test_server_.reset(new net::test_server::EmbeddedTestServer(
-      embedded_test_server_io_thread_.message_loop_proxy()));
+  embedded_test_server_.reset(new net::test_server::EmbeddedTestServer);
 }
 
 BrowserTestBase::~BrowserTestBase() {
 #if defined(OS_ANDROID)
   // RemoteTestServer can cause wait on the UI thread.
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   test_server_.reset(NULL);
 #endif
 }
 
@@ skipping 114 matching lines @@
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 }  // namespace content