Break dependencies preventing move of test_server down to net.

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/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
@@ skipping 66 matching lines @@
         download_was_successful_(false) {
   }
 
   virtual void SetUp() OVERRIDE {
     io_thread_.StartIOThread();
     profile_.reset(new TestingProfile);
     request_context_getter_ = new net::TestURLRequestContextGetter(
         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,
                    base::Unretained(this)));
     service_.reset(new GDataContactsService(
         request_context_getter_,
         profile_.get()));
     service_->Initialize();
     service_->auth_service_for_testing()->set_access_token_for_testing(
         kTestGDataAuthToken);
     service_->set_rewrite_photo_url_callback_for_testing(
         base::Bind(&GDataContactsServiceTest::RewritePhotoUrl,
                    base::Unretained(this)));
     service_->set_groups_feed_url_for_testing(
         test_server_->GetURL(kGroupsFeedFilename));
     service_->set_photo_download_timer_interval_for_testing(
         base::TimeDelta::FromMilliseconds(10));
   }
 
   virtual void TearDown() OVERRIDE {
-    test_server_->ShutdownAndWaitUntilComplete();
+    EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     test_server_.reset();
     request_context_getter_ = NULL;
     service_.reset();
   }
 
  protected:
   // Downloads contacts from |feed_filename| (within the chromeos/gdata/contacts
   // test data directory).  |min_update_time| is appended to the URL and the
   // resulting contacts are swapped into |contacts|.  Returns false if the
   // download failed.
@@ skipping 215 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