Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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

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..ff1529b5540c3ad0d58f4a9680fce0a2a94fe01b 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,12 +166,10 @@ class PeopleProviderTest : public InProcessBrowserTest {
 
   // InProcessBrowserTest overrides:
   void SetUpOnMainThread() override {
-    test_server_.reset(new EmbeddedTestServer);
-
-    ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
-    test_server_->RegisterRequestHandler(
+    embedded_test_server()->RegisterRequestHandler(
         base::Bind(&PeopleProviderTest::HandleRequest,
                    base::Unretained(this)));
+    ASSERT_TRUE(embedded_test_server()->Start());
 
     people_provider_.reset(new PeopleProvider(
         ProfileManager::GetActiveUserProfile(), &test_controller_));
@@ -180,15 +177,10 @@ class PeopleProviderTest : public InProcessBrowserTest {
     people_provider_->SetupForTest(
         base::Bind(&PeopleProviderTest::OnSearchResultsFetched,
                    base::Unretained(this)),
-        test_server_->base_url());
+        embedded_test_server()->base_url());
     people_provider_->set_use_throttling(false);
   }
 
-  void TearDownOnMainThread() override {
-    EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
-    test_server_.reset();
-  }
-
   std::string RunQuery(const std::string& query,
                        const std::string& mock_server_response) {
     people_provider_->Start(false, base::UTF8ToUTF16(query));
@@ -237,7 +229,6 @@ class PeopleProviderTest : public InProcessBrowserTest {
       run_loop_->Quit();
   }
 
-  scoped_ptr<EmbeddedTestServer> test_server_;
   scoped_ptr<base::RunLoop> run_loop_;
 
   std::string mock_server_response_;