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

chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc

 // Copyright 2014 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/search/suggestions/image_fetcher_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/suggestions/image_fetcher_delegate.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"
 #include "url/gurl.h"
 
 class SkBitmap;
 
 namespace suggestions {
 
 namespace {
 
 const char kTestUrl[] = "http://go.com/";
-const char kTestImagePath[] = "files/image_decoding/droids.png";
-const char kInvalidImagePath[] = "files/DOESNOTEXIST";
+const char kTestImagePath[] = "/image_decoding/droids.png";
+const char kInvalidImagePath[] = "/DOESNOTEXIST";
 
 const base::FilePath::CharType kDocRoot[] =
     FILE_PATH_LITERAL("chrome/test/data");
 
 class TestImageFetcherDelegate : public ImageFetcherDelegate {
  public:
   TestImageFetcherDelegate()
     : num_delegate_valid_called_(0),
       num_delegate_null_called_(0) {}
   ~TestImageFetcherDelegate() override{};
@@ skipping 13 matching lines @@
  private:
   int num_delegate_valid_called_;
   int num_delegate_null_called_;
 };
 
 }  // end namespace
 
 class ImageFetcherImplBrowserTest : public InProcessBrowserTest {
  protected:
   ImageFetcherImplBrowserTest()
-    : num_callback_valid_called_(0),
-      num_callback_null_called_(0),
-      test_server_(net::SpawnedTestServer::TYPE_HTTP,
-                   net::SpawnedTestServer::kLocalhost,
-                   base::FilePath(kDocRoot)) {}
+      : num_callback_valid_called_(0), num_callback_null_called_(0) {
+    test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot));
+  }
 
   void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(test_server_.Start());
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }
 
-  void TearDownInProcessBrowserTestFixture() override { test_server_.Stop(); }
-
   ImageFetcherImpl* CreateImageFetcher() {
     ImageFetcherImpl* fetcher =
         new ImageFetcherImpl(browser()->profile()->GetRequestContext());
     fetcher->SetImageFetcherDelegate(&delegate_);
     return fetcher;
   }
 
   void OnImageAvailable(base::RunLoop* loop,
                         const GURL& url,
                         const SkBitmap* bitmap) {
@@ skipping 13 matching lines @@
         GURL(kTestUrl),
         image_url,
         base::Bind(&ImageFetcherImplBrowserTest::OnImageAvailable,
                    base::Unretained(this), &run_loop));
     run_loop.Run();
   }
 
   int num_callback_valid_called_;
   int num_callback_null_called_;
 
-  net::SpawnedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
   TestImageFetcherDelegate delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageFetcherImplBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ImageFetcherImplBrowserTest, NormalFetch) {
   GURL image_url(test_server_.GetURL(kTestImagePath).spec());
   StartOrQueueNetworkRequestHelper(image_url);
 
   EXPECT_EQ(1, num_callback_valid_called_);
@@ skipping 19 matching lines @@
   GURL invalid_image_url(test_server_.GetURL(kInvalidImagePath).spec());
   StartOrQueueNetworkRequestHelper(invalid_image_url);
 
   EXPECT_EQ(0, num_callback_valid_called_);
   EXPECT_EQ(1, num_callback_null_called_);
   EXPECT_EQ(0, delegate_.num_delegate_valid_called());
   EXPECT_EQ(1, delegate_.num_delegate_null_called());
 }
 
 }  // namespace suggestions