Migrating tests to use EmbeddedTestServer (misc)

components/search_engines/template_url_fetcher_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 15 matching lines @@
 class TemplateURLFetcherTest : public testing::Test {
  public:
   TemplateURLFetcherTest();
 
   void SetUp() override {
     TestingProfile* profile = test_util_.profile();
     ASSERT_TRUE(profile->GetRequestContext());
     template_url_fetcher_.reset(new TemplateURLFetcher(
         test_util_.model(), profile->GetRequestContext()));
 
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
   }
 
   void TearDown() override {
     ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
   }
 
   // Called when the callback is destroyed.
   void DestroyedCallback();
 
   // TemplateURLFetcherCallbacks implementation.  (Although not derived from
@@ skipping 18 matching lines @@
   const TemplateURL* last_callback_template_url() const {
     return last_callback_template_url_.get();
   }
   int callbacks_destroyed() const { return callbacks_destroyed_; }
   int add_provider_called() const { return add_provider_called_; }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;  // To set up BrowserThreads.
   TemplateURLServiceTestUtil test_util_;
   scoped_ptr<TemplateURLFetcher> template_url_fetcher_;
-  net::test_server::EmbeddedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
 
   // The last TemplateURL to come from a callback.
   scoped_ptr<TemplateURL> last_callback_template_url_;
 
   // How many TemplateURLFetcherTestCallbacks have been destructed.
   int callbacks_destroyed_;
 
   // How many times ConfirmAddSearchProvider has been called.
   int add_provider_called_;
 
@@ skipping 249 matching lines @@
 
   std::string osdd_file_name("unicode_open_search.xml");
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::AUTODETECTED_PROVIDER, true);
   WaitForDownloadToFinish();
   const TemplateURL* t_url =
       test_util()->model()->GetTemplateURLForKeyword(keyword);
   EXPECT_EQ(base::UTF8ToUTF16("\xd1\x82\xd0\xb5\xd1\x81\xd1\x82"),
             t_url->short_name());
 }