Chromium Code Reviews| 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); |
|
mmenke
2015/11/17 21:54:12
optional: Just use embedded_test_server in these
svaldez
2015/11/17 22:18:54
Done.
|
| - 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_; |