GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1

chrome/browser/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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "googleurl/src/gurl.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TemplateURLFetcherTest;
 
 // Handles callbacks from TemplateURLFetcher.
 class TemplateURLFetcherTestCallbacks : public TemplateURLFetcherCallbacks {
  public:
   explicit TemplateURLFetcherTestCallbacks(TemplateURLFetcherTest* test)
       : test_(test) {
   }
@@ skipping 16 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     test_util_.SetUp();
     test_util_.StartIOThread();
     TestingProfile* profile = test_util_.profile();
     ASSERT_TRUE(profile);
     ASSERT_TRUE(TemplateURLFetcherFactory::GetForProfile(profile));
 
     profile->CreateRequestContext();
     ASSERT_TRUE(profile->GetRequestContext());
-    ASSERT_TRUE(test_server_.Start());
+    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
   }
 
   virtual void TearDown() OVERRIDE {
+    ASSERT_TRUE(test_server_.ShutdownAndWaitUntilComplete());
     test_util_.TearDown();
   }
 
   // Called by ~TemplateURLFetcherTestCallbacks.
   void DestroyedCallback(TemplateURLFetcherTestCallbacks* callbacks);
 
   // TemplateURLFetcherCallbacks implementation.  (Although not derived from
   // this class, this method handles those calls for the test.)
   void ConfirmAddSearchProvider(TemplateURL* template_url, Profile* profile);
 
  protected:
   // Schedules the download of the url.
   void StartDownload(const string16& keyword,
                      const std::string& osdd_file_name,
                      TemplateURLFetcher::ProviderType provider_type,
                      bool check_that_file_exists);
 
   // Waits for any downloads to finish.
   void WaitForDownloadToFinish();
 
   TemplateURLServiceTestUtil test_util_;
-  net::SpawnedTestServer test_server_;
+  net::test_server::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_;
 
   // Is the code in WaitForDownloadToFinish in a message loop waiting for a
   // callback to finish?
   bool waiting_for_download_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TemplateURLFetcherTest);
 };
 
 TemplateURLFetcherTestCallbacks::~TemplateURLFetcherTestCallbacks() {
   test_->DestroyedCallback(this);
 }
 
 void TemplateURLFetcherTestCallbacks::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
   test_->ConfirmAddSearchProvider(template_url, profile);
 }
 
 TemplateURLFetcherTest::TemplateURLFetcherTest()
-    : test_server_(net::SpawnedTestServer::TYPE_HTTP,
-                   net::SpawnedTestServer::kLocalhost,
-                   base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
+    : test_server_(
+        content::BrowserThread::GetMessageLoopProxyForThread(
+            content::BrowserThread::IO)),
       callbacks_destroyed_(0),
       add_provider_called_(0),
       waiting_for_download_(false) {
+  base::FilePath src_dir;
+  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
+  test_server_.ServeFilesFromDirectory(
+      src_dir.AppendASCII("chrome/test/data"));
 }
 
 void TemplateURLFetcherTest::DestroyedCallback(
     TemplateURLFetcherTestCallbacks* callbacks) {
   callbacks_destroyed_++;
   if (waiting_for_download_)
     base::MessageLoop::current()->Quit();
 }
 
 void TemplateURLFetcherTest::ConfirmAddSearchProvider(
@@ skipping 11 matching lines @@
 
   if (check_that_file_exists) {
     base::FilePath osdd_full_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &osdd_full_path));
     osdd_full_path = osdd_full_path.AppendASCII(osdd_file_name);
     ASSERT_TRUE(file_util::PathExists(osdd_full_path));
     ASSERT_FALSE(file_util::DirectoryExists(osdd_full_path));
   }
 
   // Start the fetch.
-  GURL osdd_url = test_server_.GetURL("files/" + osdd_file_name);
+  GURL osdd_url = test_server_.GetURL("/" + osdd_file_name);
   GURL favicon_url;
   TemplateURLFetcherFactory::GetForProfile(
       test_util_.profile())->ScheduleDownload(
           keyword, osdd_url, favicon_url, NULL,
           new TemplateURLFetcherTestCallbacks(this), provider_type);
 }
 
 void TemplateURLFetcherTest::WaitForDownloadToFinish() {
   ASSERT_FALSE(waiting_for_download_);
   waiting_for_download_ = true;
@@ skipping 158 matching lines @@
   StartDownload(keyword, osdd_file_name,
                 TemplateURLFetcher::EXPLICIT_PROVIDER, true);
   ASSERT_EQ(0, add_provider_called_);
   ASSERT_EQ(1, callbacks_destroyed_);
 
   WaitForDownloadToFinish();
   ASSERT_EQ(1, add_provider_called_);
   ASSERT_EQ(2, callbacks_destroyed_);
   ASSERT_TRUE(last_callback_template_url_.get());
 }