| Index: chrome/browser/chromeos/login/oobe_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| index e66246bf4012c636cb2cf8f76466de3620aae60e..62a7d224123a317728d3be33d2a7c5ec253ab447 100644
|
| --- a/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| @@ -152,7 +152,9 @@ class OobeTest : public chromeos::CrosInProcessBrowserTest {
|
| }
|
|
|
| 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)));
|
| @@ -168,7 +170,7 @@ class OobeTest : public chromeos::CrosInProcessBrowserTest {
|
|
|
| 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.
|
| }
|
|
|
|
|