| Index: chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
|
| diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
|
| index e8160aa26c4f4d2874ffa1061e15b4ea178a4a7d..5496cc30e054aeac9e0a33132f4ee45ceefe6863 100644
|
| --- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
|
| +++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
|
| @@ -28,7 +28,6 @@ using extensions::Manifest;
|
| 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 {
|
| @@ -135,9 +134,9 @@ class WebstoreProviderTest : 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(&WebstoreProviderTest::HandleRequest,
|
| base::Unretained(this)));
|
| @@ -248,7 +247,7 @@ class WebstoreProviderTest : 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_;
|
|
|