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

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.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 "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 
 #include "ash/shelf/shelf_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using content::WebContents;
 using content::WebContentsObserver;
 
 namespace {
 
 // Observer class to determine when favicons have completed loading.
 class ContentsObserver : public WebContentsObserver {
  public:
@@ skipping 45 matching lines @@
         browser()->tab_strip_model()->GetActiveWebContents();
     contents_observer_.reset(new ContentsObserver(web_contents));
     favicon_loader_.reset(new LauncherFaviconLoader(this, web_contents));
   }
 
   // LauncherFaviconLoader::Delegate overrides:
   void FaviconUpdated() override { favicon_updated_ = true; }
 
  protected:
   bool NavigateTo(const char* url) {
-    std::string url_path = base::StringPrintf("files/ash/launcher/%s", url);
-    ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(url_path));
+    std::string url_path = base::StringPrintf("/ash/launcher/%s", url);
+    ui_test_utils::NavigateToURL(browser(),
+                                 embedded_test_server()->GetURL(url_path));
     return true;
   }
 
   bool WaitForContentsLoaded() {
     const int64 max_seconds = 10;
     base::Time start_time = base::Time::Now();
     while (!(contents_observer_->loaded() &&
              contents_observer_->got_favicons())) {
       content::RunAllPendingInMessageLoop();
       base::TimeDelta delta = base::Time::Now() - start_time;
@@ skipping 25 matching lines @@
 
   bool favicon_updated_;
   scoped_ptr<ContentsObserver> contents_observer_;
   scoped_ptr<LauncherFaviconLoader> favicon_loader_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LauncherFaviconLoaderBrowsertest);
 };
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, SmallLauncherIcon) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-smallfavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   // No large favicons specified, bitmap should be empty.
   EXPECT_TRUE(favicon_loader_->GetFavicon().empty());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, LargeLauncherIcon) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader_->GetFavicon().height());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ManyLauncherIcons) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   // When multiple favicons are present, the correctly sized icon should be
   // chosen. The icons are sized assuming ash::kShelfSize < 128.
   EXPECT_GT(128, ash::kShelfSize);
   EXPECT_EQ(48, favicon_loader_->GetFavicon().height());
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(NavigateTo("launcher-manyfavicon.html"));
   EXPECT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(48, favicon_loader_->GetFavicon().height());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   ASSERT_TRUE(NavigateTo("launcher-smallfavicon.html"));
   ASSERT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_TRUE(favicon_loader_->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));
   ASSERT_TRUE(WaitForContentsLoaded());
   EXPECT_TRUE(WaitForFaviconUpdated());
 
   EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader_->GetFavicon().height());
 }