| Index: chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| index 6fbc24407b0b8cb231107e2938ef128bb80db6c6..310ddd1b697483ce5f364e58b1fc167184f2af55 100644
|
| --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
|
| @@ -94,8 +94,10 @@ class StreamsPrivateApiTest : public ExtensionApiTest {
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| // Init test server.
|
| - test_server_.reset(new HttpServer());
|
| - test_server_->InitializeAndWaitUntilReady();
|
| + test_server_.reset(new HttpServer(
|
| + content::BrowserThread::GetMessageLoopProxyForThread(
|
| + content::BrowserThread::IO)));
|
| + ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
|
| test_server_->RegisterRequestHandler(base::Bind(&HandleRequest));
|
|
|
| ExtensionApiTest::SetUpOnMainThread();
|
| @@ -103,7 +105,7 @@ class StreamsPrivateApiTest : public ExtensionApiTest {
|
|
|
| virtual void CleanUpOnMainThread() OVERRIDE {
|
| // Tear down the test server.
|
| - test_server_->ShutdownAndWaitUntilComplete();
|
| + EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
|
| test_server_.reset();
|
| ExtensionApiTest::CleanUpOnMainThread();
|
| }
|
|
|