Break dependencies preventing move of test_server down to net.

chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

Index: chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
index 49a36dda556fa49eaa442936852b9abbc624079f..126c83064d32aca3697a065c3e20d3c1286cebdc 100644
--- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
+++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
@@ -84,7 +84,10 @@ class GDataContactsServiceTest : public testing::Test {
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::IO));
 
-    test_server_.reset(new google_apis::test_server::HttpServer());
+    test_server_.reset(
+        new google_apis::test_server::HttpServer(
+            content::BrowserThread::GetMessageLoopProxyForThread(
+                content::BrowserThread::IO)));
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&GDataContactsServiceTest::HandleDownloadRequest,
@@ -105,7 +108,7 @@ class GDataContactsServiceTest : public testing::Test {
   }
 
   virtual void TearDown() OVERRIDE {
-    test_server_->ShutdownAndWaitUntilComplete();
+    EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     test_server_.reset();
     request_context_getter_ = NULL;
     service_.reset();