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

Unified Diff: google_apis/drive/base_requests_server_unittest.cc

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. Created 5 years, 2 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
« no previous file with comments | « extensions/common/api/test.json ('k') | google_apis/drive/base_requests_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/drive/base_requests_server_unittest.cc
diff --git a/google_apis/drive/base_requests_server_unittest.cc b/google_apis/drive/base_requests_server_unittest.cc
index e8da79dfd6e05f93b30718d0089fb1077e1e9b99..b4285a042b9d6a7a82c3213f364cc1ebca40f970 100644
--- a/google_apis/drive/base_requests_server_unittest.cc
+++ b/google_apis/drive/base_requests_server_unittest.cc
@@ -45,7 +45,7 @@ class BaseRequestsServerTest : public testing::Test {
message_loop_.task_runner(),
kTestUserAgent));
- ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+ ASSERT_TRUE(test_server_.Start());
test_server_.RegisterRequestHandler(
base::Bind(&test_util::HandleDownloadFileRequest,
test_server_.base_url(),
@@ -58,7 +58,7 @@ class BaseRequestsServerTest : public testing::Test {
}
base::MessageLoopForIO message_loop_; // Test server needs IO thread.
- net::test_server::EmbeddedTestServer test_server_;
+ net::EmbeddedTestServer test_server_;
scoped_ptr<RequestSender> request_sender_;
scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
base::ScopedTempDir temp_dir_;
« no previous file with comments | « extensions/common/api/test.json ('k') | google_apis/drive/base_requests_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698