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

chrome/browser/chromeos/policy/upload_job_unittest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/upload_job.h"
 
 #include <queue>
 #include <set>
 #include <utility>
 
@@ skipping 160 matching lines @@
 
   void SetExpectedError(scoped_ptr<UploadJob::ErrorCode> expected_error) {
     expected_error_ = expected_error.Pass();
   }
 
   // testing::Test:
   void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         base::ThreadTaskRunnerHandle::Get());
     oauth2_service_.AddAccount("robot@gmail.com");
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
   }
 
   // testing::Test:
   void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
  protected:
   scoped_ptr<UploadJob> PrepareUploadJob(scoped_ptr<
       UploadJobImpl::MimeBoundaryGenerator> mime_boundary_generator) {
     scoped_ptr<UploadJob> upload_job(new UploadJobImpl(
         GetServerURL(), kRobotAccountId, &oauth2_service_,
         request_context_getter_.get(), this, mime_boundary_generator.Pass()));
 
     std::map<std::string, std::string> header_entries;
     header_entries.insert(std::make_pair(kCustomField1, "CUSTOM1"));
     scoped_ptr<std::string> data(new std::string(kTestPayload1));
     upload_job->AddDataSegment("Name1", "file1.ext", header_entries,
                                data.Pass());
 
     header_entries.insert(std::make_pair(kCustomField2, "CUSTOM2"));
     scoped_ptr<std::string> data2(new std::string(kTestPayload2));
     upload_job->AddDataSegment("Name2", "", header_entries, data2.Pass());
     return upload_job.Pass();
   }
 
   content::TestBrowserThreadBundle test_browser_thread_bundle_;
   base::RunLoop run_loop_;
-  net::test_server::EmbeddedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   MockOAuth2TokenService oauth2_service_;
 
   scoped_ptr<UploadJob::ErrorCode> expected_error_;
 };
 
 class UploadFlowTest : public UploadJobTestBase {
  public:
   UploadFlowTest() {}
 
@@ skipping 112 matching lines @@
       "customfield2: CUSTOM2\r\n"
       "\r\n"
       "**||--||PAYLOAD2||--||**\r\n--"
       "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA--\r\n");
 
   upload_job->Start();
   run_loop_.Run();
 }
 
 }  // namespace policy