chrome/browser/chromeos/policy/upload_job_unittest.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/upload_job_unittest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 1 month 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 | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/upload_job_unittest.cc

diff --git a/chrome/browser/chromeos/policy/upload_job_unittest.cc b/chrome/browser/chromeos/policy/upload_job_unittest.cc

index 76eca09364ffb261a6af27e75629194e3a56cccd..fffbabe251be19ac5105431fbffaee2867af0086 100644

--- a/chrome/browser/chromeos/policy/upload_job_unittest.cc

+++ b/chrome/browser/chromeos/policy/upload_job_unittest.cc

@@ -178,7 +178,7 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate {

request_context_getter_ = new net::TestURLRequestContextGetter(

base::ThreadTaskRunnerHandle::Get());

oauth2_service_.AddAccount("robot@gmail.com");

- ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());

+ ASSERT_TRUE(test_server_.Start());

}

// testing::Test:

@@ -207,7 +207,7 @@ class UploadJobTestBase : public testing::Test, public UploadJob::Delegate {

content::TestBrowserThreadBundle test_browser_thread_bundle_;

base::RunLoop run_loop_;

- net::test_server::EmbeddedTestServer test_server_;

+ net::EmbeddedTestServer test_server_;

scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;

MockOAuth2TokenService oauth2_service_;