net: Remove FilePath version of URLRequestMockHTTPJob::GetMockUrl().

chrome/browser/captive_portal/captive_portal_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 <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 2173 matching lines @@
   WebContents* broken_tab_contents = tab_strip_model->GetActiveWebContents();
 
   CaptivePortalObserver portal_observer(browser()->profile());
   FastErrorWithInterstitialTimer(browser(), cert_error_url);
 
   // Page appears loading. Navigating away shouldn't result in any interstitial.
   // Can't use ui_test_utils::NavigateToURLWithDisposition because it waits for
   // a load stop notification before starting a new navigation.
   MultiNavigationObserver test_navigation_observer;
   browser()->OpenURL(content::OpenURLParams(
-      URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(FILE_PATH_LITERAL("title2.html"))),
+      URLRequestMockHTTPJob::GetMockUrl("title2.html"),
       content::Referrer(),
       CURRENT_TAB,
       ui::PAGE_TRANSITION_TYPED, false));
   // Expect two navigations: First one for stopping the hanging page, second one
   // for completing the load of the above navigation.
   test_navigation_observer.WaitForNavigations(2);
 
   // Make sure that the |ssl_error_handler| is deleted.
   EXPECT_TRUE(nullptr == SSLErrorHandler::FromWebContents(broken_tab_contents));
 
@@ skipping 223 matching lines @@
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoBrokenTabs) {
   SlowLoadBehindCaptivePortal(browser(), true);
 
   // Can't set the TabReloader HTTPS timeout on a new tab without doing some
   // acrobatics, so open a new tab at a normal page, and then navigate it to a
   // timeout.
   MultiNavigationObserver navigation_observer;
   CaptivePortalObserver portal_observer(browser()->profile());
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
-      URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(FILE_PATH_LITERAL("title2.html"))),
+      URLRequestMockHTTPJob::GetMockUrl("title2.html"),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   ASSERT_EQ(3, tab_strip_model->count());
   EXPECT_FALSE(CheckPending(browser()));
   EXPECT_EQ(0, portal_observer.num_results_received());
   EXPECT_EQ(1, NumLoadingTabs());
   EXPECT_EQ(1, navigation_observer.num_navigations());
   EXPECT_EQ(1, navigation_observer.NumNavigationsForTab(
@@ skipping 44 matching lines @@
 // logging in.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, NavigateBrokenTab) {
   // Go to the error page.
   SlowLoadBehindCaptivePortal(browser(), true);
   FailLoadsWithoutLogin(browser(), 1);
 
   // Navigate the error tab to a non-error page.
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   tab_strip_model->ActivateTabAt(0, true);
   ui_test_utils::NavigateToURL(
-      browser(), URLRequestMockHTTPJob::GetMockUrl(
-                     base::FilePath(FILE_PATH_LITERAL("title2.html"))));
+      browser(), URLRequestMockHTTPJob::GetMockUrl("title2.html"));
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
             GetStateOfTabReloaderAt(browser(), 0));
 
   // Simulate logging in.
   tab_strip_model->ActivateTabAt(1, true);
   Login(browser(), 0, 0);
 }
 
 // Checks that captive portal detection triggers correctly when a same-site
 // navigation is cancelled by a navigation to the same site.
@@ skipping 25 matching lines @@
       GURL(kMockHttpsUrl),
       GURL(kMockHttpsUrl2));
 }
 
 // Checks that captive portal detection triggers correctly when a cross-site
 // navigation is cancelled by a navigation to yet another site.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest,
                        NavigateLoadingTabToTimeoutThreeSites) {
   RunNavigateLoadingTabToTimeoutTest(
       browser(),
-      URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(FILE_PATH_LITERAL("title.html"))),
+      URLRequestMockHTTPJob::GetMockUrl("title.html"),
       GURL(kMockHttpsUrl),
       GURL(kMockHttpsUrl2));
 }
 
 // Checks that navigating a timed out tab back clears its state.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) {
   // Navigate to a working page.
   ui_test_utils::NavigateToURL(
-      browser(),
-      URLRequestMockHTTPJob::GetMockUrl(
-          base::FilePath(FILE_PATH_LITERAL("title2.html"))));
+      browser(), URLRequestMockHTTPJob::GetMockUrl("title2.html"));
 
   // Go to the error page.
   SlowLoadBehindCaptivePortal(browser(), true);
   FailLoadsWithoutLogin(browser(), 1);
 
   CaptivePortalObserver portal_observer(browser()->profile());
   MultiNavigationObserver navigation_observer;
 
   // Activate the error page tab again and go back.
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
@@ skipping 11 matching lines @@
 // Checks that navigating back to a timeout triggers captive portal detection.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) {
   // Disable captive portal detection so the first navigation doesn't open a
   // login tab.
   EnableCaptivePortalDetection(browser()->profile(), false);
 
   SlowLoadNoCaptivePortal(browser(), captive_portal::RESULT_INTERNET_CONNECTED);
 
   // Navigate to a working page.
   ui_test_utils::NavigateToURL(
-      browser(), URLRequestMockHTTPJob::GetMockUrl(
-                     base::FilePath(FILE_PATH_LITERAL("title2.html"))));
+      browser(), URLRequestMockHTTPJob::GetMockUrl("title2.html"));
   ASSERT_EQ(CaptivePortalTabReloader::STATE_NONE,
             GetStateOfTabReloaderAt(browser(), 0));
 
   EnableCaptivePortalDetection(browser()->profile(), true);
 
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   CaptivePortalTabReloader* tab_reloader =
       GetTabReloader(tab_strip_model->GetActiveWebContents());
   ASSERT_TRUE(tab_reloader);
   SetSlowSSLLoadTime(tab_reloader, base::TimeDelta());
@@ skipping 263 matching lines @@
 
   EXPECT_EQ(CaptivePortalTabReloader::STATE_NEEDS_RELOAD,
             GetStateOfTabReloaderAt(browser(), broken_tab_index));
 
   WaitForInterstitialAttach(broken_tab_contents);
   portal_observer.WaitForResults(1);
 
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting,
             GetInterstitialType(broken_tab_contents));
 }