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

content/browser/loader/resource_dispatcher_host_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 "base/memory/ref_counted.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 39 matching lines @@
         BrowserThread::IO, FROM_HERE,
         base::Bind(&net::URLRequestFailedJob::AddUrlHandler));
   }
 
   void OnDownloadCreated(DownloadManager* manager,
                          DownloadItem* item) override {
     if (!got_downloads_)
       got_downloads_ = !!manager->InProgressCount();
   }
 
-  GURL GetMockURL(const std::string& file) {
-    return net::URLRequestMockHTTPJob::GetMockUrl(
-        base::FilePath().AppendASCII(file));
-  }
-
   void CheckTitleTest(const GURL& url,
                       const std::string& expected_title) {
     base::string16 expected_title16(ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     NavigateToURL(shell(), url);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
   bool GetPopupTitle(const GURL& url, base::string16* title) {
     NavigateToURL(shell(), url);
@@ skipping 41 matching lines @@
   GURL url(embedded_test_server()->GetURL("/dynamic2.html"));
   base::string16 title;
   ASSERT_TRUE(GetPopupTitle(url, &title));
   EXPECT_TRUE(base::StartsWith(title, ASCIIToUTF16("My Dynamic Title"),
                                base::CompareCase::SENSITIVE))
       << "Actual title: " << title;
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        SniffHTMLWithNoContentType) {
-  CheckTitleTest(GetMockURL("content-sniffer-test0.html"),
-                 "Content Sniffer Test 0");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test0.html"),
+      "Content Sniffer Test 0");
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        RespectNoSniffDirective) {
-  CheckTitleTest(GetMockURL("nosniff-test.html"),
+  CheckTitleTest(net::URLRequestMockHTTPJob::GetMockUrl("nosniff-test.html"),
                  "mock.http/nosniff-test.html");
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        DoNotSniffHTMLFromTextPlain) {
-  CheckTitleTest(GetMockURL("content-sniffer-test1.html"),
-                 "mock.http/content-sniffer-test1.html");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test1.html"),
+      "mock.http/content-sniffer-test1.html");
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        DoNotSniffHTMLFromImageGIF) {
-  CheckTitleTest(GetMockURL("content-sniffer-test2.html"),
-                 "mock.http/content-sniffer-test2.html");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test2.html"),
+      "mock.http/content-sniffer-test2.html");
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        SniffNoContentTypeNoData) {
   // Make sure no downloads start.
   BrowserContext::GetDownloadManager(
       shell()->web_contents()->GetBrowserContext())->AddObserver(this);
-  CheckTitleTest(GetMockURL("content-sniffer-test3.html"),
-                 "Content Sniffer Test 3");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test3.html"),
+      "Content Sniffer Test 3");
   EXPECT_EQ(1u, Shell::windows().size());
   ASSERT_FALSE(got_downloads());
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        ContentDispositionEmpty) {
-  CheckTitleTest(GetMockURL("content-disposition-empty.html"), "success");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-disposition-empty.html"),
+      "success");
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        ContentDispositionInline) {
-  CheckTitleTest(GetMockURL("content-disposition-inline.html"), "success");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-disposition-inline.html"),
+      "success");
 }
 
 // Test for bug #1091358.
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   NavigateToURL(
       shell(), embedded_test_server()->GetURL("/sync_xmlhttprequest.html"));
 
   // Let's check the XMLHttpRequest ran successfully.
   bool success = false;
@@ skipping 53 matching lines @@
 // Tests that onunload is run for cross-site requests.  (Bug 1114994)
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        DISABLED_CrossSiteOnunloadCookie) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url = embedded_test_server()->GetURL("/onunload_cookie.html");
   CheckTitleTest(url, "set cookie on unload");
 
   // Navigate to a new cross-site page, to dispatch unload event and set the
   // cookie.
-  CheckTitleTest(GetMockURL("content-sniffer-test0.html"),
-                 "Content Sniffer Test 0");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test0.html"),
+      "Content Sniffer Test 0");
 
   // Check that the cookie was set.
   EXPECT_EQ("onunloadCookie=foo", GetCookies(url));
 }
 
 // If this flakes, use http://crbug.com/130404
 // Tests that onunload is run for cross-site requests to URLs that complete
 // without network loads (e.g., about:blank, data URLs).
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        DISABLED_CrossSiteImmediateLoadOnunloadCookie) {
@@ skipping 69 matching lines @@
   // Cause the renderer to crash.
   RenderProcessHostWatcher crash_observer(
       shell()->web_contents(),
       RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   NavigateToURL(shell(), GURL(kChromeUICrashURL));
   // Wait for browser to notice the renderer crash.
   crash_observer.Wait();
 
   // Navigate to a new cross-site page.  The browser should not wait around for
   // the old renderer's on{before}unload handlers to run.
-  CheckTitleTest(GetMockURL("content-sniffer-test0.html"),
-                 "Content Sniffer Test 0");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test0.html"),
+      "Content Sniffer Test 0");
 }
 
 // Tests that cross-site navigations work when the new page does not go through
 // the BufferedEventHandler (e.g., non-http{s} URLs).  (Bug 1225872)
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossSiteNavigationNonBuffered) {
   // Start with an HTTP page.
-  CheckTitleTest(GetMockURL("content-sniffer-test0.html"),
-                 "Content Sniffer Test 0");
+  CheckTitleTest(
+      net::URLRequestMockHTTPJob::GetMockUrl("content-sniffer-test0.html"),
+      "Content Sniffer Test 0");
 
   // Now load a file:// page, which does not use the BufferedEventHandler.
   // Make sure that the page loads and displays a title, and doesn't get stuck.
   GURL url = GetTestUrl("", "title2.html");
   CheckTitleTest(url, "Title Of Awesomeness");
 }
 
 // Flaky everywhere. http://crbug.com/130404
 // Tests that a cross-site navigation to an error page (resulting in the link
 // doctor page) still runs the onunload handler and can support navigations
@@ skipping 69 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossOriginRedirectBlocked) {
   // We expect the following URL requests from this test:
   // 1-  http://mock.http/cross-origin-redirect-blocked.html
   // 2-  http://mock.http/redirect-to-title2.html
   // 3-  http://mock.http/title2.html
   //
   // If the redirect in #2 were not blocked, we'd also see a request
   // for http://mock.http:4000/title2.html, and the title would be different.
-  CheckTitleTest(GetMockURL("cross-origin-redirect-blocked.html"),
+  CheckTitleTest(net::URLRequestMockHTTPJob::GetMockUrl(
+                     "cross-origin-redirect-blocked.html"),
                  "Title Of More Awesomeness");
 }
 
 // Tests that ResourceRequestInfoImpl is updated correctly on failed
 // requests, to prevent calling Read on a request that has already failed.
 // See bug 40250.
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossSiteFailedRequest) {
   // Visit another URL first to trigger a cross-site navigation.
   NavigateToURL(shell(), GetTestUrl("", "simple_page.html"));
@@ skipping 78 matching lines @@
   NavigateToURLBlockUntilNavigationsComplete(
       shell(),
       embedded_test_server()->GetURL("/client_redirect.html"),
       2);
 
   EXPECT_TRUE(
       delegate.page_transition() & ui::PAGE_TRANSITION_CLIENT_REDIRECT);
 }
 
 }  // namespace content