GTTF: Make EmbeddedTestServer always use its own thread for IO

net/test/embedded_test_server/embedded_test_server_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 "net/test/embedded_test_server/embedded_test_server.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
 #include "net/http/http_response_headers.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ skipping 39 matching lines @@
   }
 
   virtual void SetUp() OVERRIDE {
     base::Thread::Options thread_options;
     thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
     ASSERT_TRUE(io_thread_.StartWithOptions(thread_options));
 
     request_context_getter_ = new TestURLRequestContextGetter(
         io_thread_.message_loop_proxy());
 
-    server_.reset(new EmbeddedTestServer(io_thread_.message_loop_proxy()));
+    server_.reset(new EmbeddedTestServer);
     ASSERT_TRUE(server_->InitializeAndWaitUntilReady());
   }
 
   virtual void TearDown() OVERRIDE {
     ASSERT_TRUE(server_->ShutdownAndWaitUntilComplete());
   }
 
   // URLFetcherDelegate override.
   virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE {
     ++num_responses_received_;
@@ skipping 195 matching lines @@
     base::Thread::Options thread_options;
     thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
     ASSERT_TRUE(io_thread.StartWithOptions(thread_options));
     io_thread_runner = io_thread.message_loop_proxy();
 
     scoped_ptr<base::MessageLoop> loop;
     if (message_loop_present_on_initialize_)
       loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
 
     // Create the test server instance.
-    EmbeddedTestServer server(io_thread_runner);
+    EmbeddedTestServer server;
     base::FilePath src_dir;
     ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
     ASSERT_TRUE(server.InitializeAndWaitUntilReady());
 
     // Make a request and wait for the reply.
     if (!loop)
       loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
 
     scoped_ptr<URLFetcher> fetcher(URLFetcher::Create(
         server.GetURL("/test?q=foo"), URLFetcher::GET, this));
@@ skipping 33 matching lines @@
   ASSERT_TRUE(base::PlatformThread::Create(0, &delegate, &thread_handle));
   base::PlatformThread::Join(thread_handle);
 }
 
 INSTANTIATE_TEST_CASE_P(EmbeddedTestServerThreadingTestInstantiation,
                         EmbeddedTestServerThreadingTest,
                         testing::Combine(testing::Bool(), testing::Bool()));
 
 }  // namespace test_server
 }  // namespace net