Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(356)

Unified Diff: chrome/browser/chromeos/login/oobe_browsertest.cc

Issue 14365019: Break dependencies preventing move of test_server down to net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
}

Powered by Google App Engine
This is Rietveld 408576698