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

Unified Diff: chrome/browser/google_apis/base_operations_server_unittest.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/google_apis/base_operations_server_unittest.cc
diff --git a/chrome/browser/google_apis/base_operations_server_unittest.cc b/chrome/browser/google_apis/base_operations_server_unittest.cc
index 81f566d5b3cf8db56913c080a96fcd5d162772cd..8479e215c499efff7d41279079c1da5bad0ec5f3 100644
--- a/chrome/browser/google_apis/base_operations_server_unittest.cc
+++ b/chrome/browser/google_apis/base_operations_server_unittest.cc
@@ -35,7 +35,9 @@ class BaseOperationsServerTest : public testing::Test {
BaseOperationsServerTest()
: ui_thread_(content::BrowserThread::UI, &message_loop_),
file_thread_(content::BrowserThread::FILE),
- io_thread_(content::BrowserThread::IO) {
+ io_thread_(content::BrowserThread::IO),
+ test_server_(content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::IO)) {
}
virtual void SetUp() OVERRIDE {
@@ -55,7 +57,7 @@ class BaseOperationsServerTest : public testing::Test {
}
virtual void TearDown() OVERRIDE {
- test_server_.ShutdownAndWaitUntilComplete();
+ EXPECT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
request_context_getter_ = NULL;
}

Powered by Google App Engine
This is Rietveld 408576698