GTTF: Make EmbeddedTestServer always use its own thread for IO

chrome/browser/chromeos/contacts/gdata_contacts_service_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 "chrome/browser/chromeos/contacts/gdata_contacts_service.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 60 matching lines @@
         io_thread_(content::BrowserThread::IO),
         download_was_successful_(false) {
   }
 
   virtual void SetUp() OVERRIDE {
     io_thread_.StartIOThread();
     request_context_getter_ = new net::TestURLRequestContextGetter(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::IO));
 
-    test_server_.reset(
-        new net::test_server::EmbeddedTestServer(
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::IO)));
+    test_server_.reset(new net::test_server::EmbeddedTestServer);
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&GDataContactsServiceTest::HandleDownloadRequest,
                    base::Unretained(this)));
     service_.reset(new GDataContactsService(request_context_getter_.get(),
                                             new google_apis::DummyAuthService));
     service_->set_rewrite_photo_url_callback_for_testing(
         base::Bind(&GDataContactsServiceTest::RewritePhotoUrl,
                    base::Unretained(this)));
     service_->set_groups_feed_url_for_testing(
@@ skipping 54 matching lines @@
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     download_was_successful_ = false;
     downloaded_contacts_.reset(new ScopedVector<contacts::Contact>());
     base::MessageLoop::current()->Quit();
   }
 
   // Handles a request for downloading a file. Reads a requested file and
   // returns the content.
   scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest(
       const net::test_server::HttpRequest& request) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     // Requested url must not contain a query string.
     scoped_ptr<net::test_server::BasicHttpResponse> result =
         google_apis::test_util::CreateHttpResponseFromFile(
             google_apis::test_util::GetTestFilePath(
                 std::string("chromeos/gdata/contacts") + request.relative_url));
     return result.PassAs<net::test_server::HttpResponse>();
   }
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
@@ skipping 156 matching lines @@
   scoped_ptr<contacts::Contact> contact2(new contacts::Contact);
   InitContact("http://example.com/2", "2012-06-21T16:20:13.208Z",
               false, "Bob Smith", "Bob", "", "Smith", "", "",
               contact2.get());
   EXPECT_EQ(contacts::test::VarContactsToString(
                 2, contact1.get(), contact2.get()),
             contacts::test::ContactsToString(*contacts));
 }
 
 }  // namespace contacts