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

Unified Diff: chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase bug. 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
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_;

Powered by Google App Engine
This is Rietveld 408576698