Removing test_server() and switching over to embedded_test_server.

chrome/browser/translate/translate_manager_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 "components/translate/core/browser/translate_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
@@ skipping 43 matching lines @@
  private:
   using LangageDetectionObserver =
       ui_test_utils::WindowedNotificationObserverWithDetails<
           translate::LanguageDetectionDetails>;
 
   scoped_ptr<LangageDetectionObserver> language_detected_signal_;
 };
 
 // Tests that the CLD (Compact Language Detection) works properly.
 IN_PROC_BROWSER_TEST_F(TranslateManagerBrowserTest, PageLanguageDetection) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // The InProcessBrowserTest opens a new tab, let's wait for that first.
   WaitUntilLanguageDetected();
 
   content::WebContents* current_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   std::string adopted_language = GetLanguageFor(current_web_contents);
   EXPECT_EQ("und", adopted_language);
 
   // Open a new tab with a page in English.
-  AddTabAtIndex(0, GURL(test_server()->GetURL("files/english_page.html")),
+  AddTabAtIndex(0, GURL(embedded_test_server()->GetURL("/english_page.html")),
                 ui::PAGE_TRANSITION_TYPED);
 
   ResetObserver();
 
   current_web_contents = browser()->tab_strip_model()->GetActiveWebContents();
   ChromeTranslateClient* chrome_translate_client =
       ChromeTranslateClient::FromWebContents(current_web_contents);
 
   WaitUntilLanguageDetected();
   adopted_language = GetLanguageFor(current_web_contents);
   EXPECT_EQ("en", adopted_language);
   EXPECT_EQ("en",
             chrome_translate_client->GetLanguageState().original_language());
 
   ResetObserver();
 
   // Now navigate to a page in French.
   ui_test_utils::NavigateToURL(
-      browser(), GURL(test_server()->GetURL("files/french_page.html")));
+      browser(), GURL(embedded_test_server()->GetURL("/french_page.html")));
 
   WaitUntilLanguageDetected();
   adopted_language = GetLanguageFor(current_web_contents);
   EXPECT_EQ("fr", adopted_language);
   EXPECT_EQ("fr",
             chrome_translate_client->GetLanguageState().original_language());
 }
 
 // Test is flaky on Win http://crbug.com/166334
 #if defined(OS_WIN)
@@ skipping 56 matching lines @@
     active_adopted_language = GetLanguageFor(active_web_contents);
   } else if (restored_adopted_language.empty()) {
     ResetObserver();
     WaitUntilLanguageDetected();
     restored_adopted_language = GetLanguageFor(restored_web_contents);
   }
 
   EXPECT_EQ("fr", restored_adopted_language);
   EXPECT_EQ("und", active_adopted_language);
 }