chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc - Issue 1378123003: Adding SSL ETS Tests

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/ui/app_list/search/people/people_provider_browsertest.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 | « chrome/browser/translate/translate_browsertest.cc ('k') | chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc

diff --git a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc

index 73979b969dfc8675197a054e52e6be21e7a6e0bf..bbf0a467fb3747f8e9cf8088a5c1c92455bdc549 100644

--- a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc

+++ b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc

@@ -25,7 +25,6 @@ using content::BrowserThread;

using net::test_server::BasicHttpResponse;

using net::test_server::HttpRequest;

using net::test_server::HttpResponse;

-using net::test_server::EmbeddedTestServer;

namespace app_list {

namespace test {

@@ -167,9 +166,9 @@ class PeopleProviderTest : public InProcessBrowserTest {

// InProcessBrowserTest overrides:

void SetUpOnMainThread() override {

- test_server_.reset(new EmbeddedTestServer);

+ test_server_.reset(new net::EmbeddedTestServer);

- ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(test_server_->Start());

test_server_->RegisterRequestHandler(

base::Bind(&PeopleProviderTest::HandleRequest,

base::Unretained(this)));

@@ -237,7 +236,7 @@ class PeopleProviderTest : public InProcessBrowserTest {

run_loop_->Quit();

}

- scoped_ptr<EmbeddedTestServer> test_server_;

+ scoped_ptr<net::EmbeddedTestServer> test_server_;

scoped_ptr<base::RunLoop> run_loop_;

std::string mock_server_response_;