Break dependencies preventing move of test_server down to net.

chrome/browser/chromeos/login/oobe_browsertest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
@@ skipping 134 matching lines @@
     content_browser_client_.reset(new TestContentBrowserClient());
     original_content_browser_client_ = content::SetBrowserClientForTesting(
         content_browser_client_.get());
     base::FilePath test_data_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
     CHECK(file_util::ReadFileToString(test_data_dir.Append(kServiceLogin),
                                       &service_login_response_));
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    test_server_ = new HttpServer();  // Constructor wants UI thread.
+    test_server_ = new HttpServer(
+        content::BrowserThread::GetMessageLoopProxyForThread(
+            content::BrowserThread::IO));
     CHECK(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&OobeTest::HandleRequest, base::Unretained(this)));
     LOG(INFO) << "Set up http server at " << test_server_->base_url();
     CHECK(test_server_->port() >= 8040 && test_server_->port() < 8045)
         << "Current manifest_test.json for gaia_login restrictions "
         << "does not allow this port";
 
     const std::string gaia_url =
         "http://localhost:" + test_server_->base_url().port();
     content_browser_client_->browser_main_extra_parts_->set_gaia_url(gaia_url);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     LOG(INFO) << "Stopping the http server.";
-    test_server_->ShutdownAndWaitUntilComplete();
+    EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     delete test_server_;  // Destructor wants UI thread.
   }
 
   scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
     GURL url = test_server_->GetURL(request.relative_url);
     LOG(INFO) << "Http request: " << url.spec();
 
     scoped_ptr<HttpResponse> http_response(new HttpResponse());
     if (url.path() == "/ServiceLogin") {
       http_response->set_code(test_server::SUCCESS);
@@ skipping 34 matching lines @@
   wizard_controller->SkipToLoginForTesting();
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   content_browser_client_->browser_main_extra_parts_->set_quit_task(
       runner->QuitClosure());
   runner->Run();
 }
 
 }