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

content/browser/download/download_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.
 
 // This file contains download browser tests that are known to be runnable
 // in a pure content context.  Over time tests should be migrated here.
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 780 matching lines @@
   NavigateToURL(shell(), GURL(net::URLRequestSlowDownloadJob::kUnknownSizeUrl));
   observer1->WaitForFinished();
 
   std::vector<DownloadItem*> downloads;
   DownloadManagerForShell(shell())->GetAllDownloads(&downloads);
   ASSERT_EQ(1u, downloads.size());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, downloads[0]->GetState());
   DownloadItem* download1 = downloads[0];  // The only download.
 
   // Start the second download and wait until it's done.
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(file));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
   // Download the file and wait.
   NavigateToURLAndWaitForDownload(shell(), url, DownloadItem::COMPLETE);
 
   // Should now have 2 items on the manager.
   downloads.clear();
   DownloadManagerForShell(shell())->GetAllDownloads(&downloads);
   ASSERT_EQ(2u, downloads.size());
   // We don't know the order of the downloads.
   DownloadItem* download2 = downloads[(download1 == downloads[0]) ? 1 : 0];
 
@@ skipping 22 matching lines @@
 
   base::FilePath file2(download2->GetTargetFilePath());
   ASSERT_TRUE(base::ContentsEqual(
       file2, GetTestFilePath("download", "download-test.lib")));
 }
 
 #if defined(ENABLE_PLUGINS)
 // Content served with a MIME type of application/octet-stream should be
 // downloaded even when a plugin can be found that handles the file type.
 IN_PROC_BROWSER_TEST_F(DownloadContentTest, DownloadOctetStream) {
-  const base::FilePath::CharType kTestFilePath[] =
-      FILE_PATH_LITERAL("octet-stream.abc");
   const char kTestPluginName[] = "TestPlugin";
   const char kTestMimeType[] = "application/x-test-mime-type";
   const char kTestFileType[] = "abc";
 
   WebPluginInfo plugin_info;
   plugin_info.name = base::ASCIIToUTF16(kTestPluginName);
   plugin_info.mime_types.push_back(
       WebPluginMimeType(kTestMimeType, kTestFileType, ""));
   plugin_info.type = WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
   PluginServiceImpl::GetInstance()->RegisterInternalPlugin(plugin_info, false);
 
   // The following is served with a Content-Type of application/octet-stream.
   GURL url(
-      net::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kTestFilePath)));
+      net::URLRequestMockHTTPJob::GetMockUrl("octet-stream.abc"));
   NavigateToURLAndWaitForDownload(shell(), url, DownloadItem::COMPLETE);
 }
 #endif
 
 // Try to cancel just before we release the download file, by delaying final
 // rename callback.
 IN_PROC_BROWSER_TEST_F(DownloadContentTest, CancelAtFinalRename) {
   // Setup new factory.
   DownloadFileWithDelayFactory* file_factory =
       new DownloadFileWithDelayFactory();
   DownloadManagerImpl* download_manager(DownloadManagerForShell(shell()));
   download_manager->SetDownloadFileFactoryForTesting(
       scoped_ptr<DownloadFileFactory>(file_factory).Pass());
 
   // Create a download
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  NavigateToURL(shell(), net::URLRequestMockHTTPJob::GetMockUrl(file));
+  NavigateToURL(shell(),
+                net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Wait until the first (intermediate file) rename and execute the callback.
   file_factory->WaitForSomeCallback();
   std::vector<base::Closure> callbacks;
   file_factory->GetAllRenameCallbacks(&callbacks);
   ASSERT_EQ(1u, callbacks.size());
   callbacks[0].Run();
   callbacks.clear();
 
   // Wait until the second (final) rename callback is posted.
@@ skipping 27 matching lines @@
   // Mark delegate for delayed open.
   GetDownloadManagerDelegate()->SetDelayedOpen(true);
 
   // Setup new factory.
   DownloadFileWithDelayFactory* file_factory =
       new DownloadFileWithDelayFactory();
   download_manager->SetDownloadFileFactoryForTesting(
       scoped_ptr<DownloadFileFactory>(file_factory).Pass());
 
   // Create a download
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  NavigateToURL(shell(), net::URLRequestMockHTTPJob::GetMockUrl(file));
+  NavigateToURL(shell(),
+                net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Wait until the first (intermediate file) rename and execute the callback.
   file_factory->WaitForSomeCallback();
   std::vector<base::Closure> callbacks;
   file_factory->GetAllRenameCallbacks(&callbacks);
   ASSERT_EQ(1u, callbacks.size());
   callbacks[0].Run();
   callbacks.clear();
 
   // Wait until the second (final) rename callback is posted.
@@ skipping 88 matching lines @@
   // Mark delegate for delayed open.
   GetDownloadManagerDelegate()->SetDelayedOpen(true);
 
   // Setup new factory.
   DownloadFileWithDelayFactory* file_factory =
       new DownloadFileWithDelayFactory();
   download_manager->SetDownloadFileFactoryForTesting(
       scoped_ptr<DownloadFileFactory>(file_factory).Pass());
 
   // Create a download
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  NavigateToURL(shell(), net::URLRequestMockHTTPJob::GetMockUrl(file));
+  NavigateToURL(shell(),
+                net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Wait until the first (intermediate file) rename and execute the callback.
   file_factory->WaitForSomeCallback();
   std::vector<base::Closure> callbacks;
   file_factory->GetAllRenameCallbacks(&callbacks);
   ASSERT_EQ(1u, callbacks.size());
   callbacks[0].Run();
   callbacks.clear();
 
   // Wait until the second (final) rename callback is posted.
@@ skipping 285 matching lines @@
     // Completion.
     {DownloadItem::COMPLETE, GetSafeBufferChunk() * 3},
   };
 
   recorder.CompareToExpectedRecord(expected_record, arraysize(expected_record));
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadContentTest, ResumeWithFileInitError) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableDownloadResumption);
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(file));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Setup the error injector.
   scoped_refptr<TestFileErrorInjector> injector(
       TestFileErrorInjector::Create(DownloadManagerForShell(shell())));
 
   TestFileErrorInjector::FileErrorInfo err = {
     url.spec(),
     TestFileErrorInjector::FILE_OPERATION_INITIALIZE,
     0,
     DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE
@@ skipping 29 matching lines @@
       download, base::Bind(DownloadCompleteFilter));
   download->Resume();
   completion_observer.WaitForEvent();
   EXPECT_EQ(download->GetState(), DownloadItem::COMPLETE);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadContentTest,
                        ResumeWithFileIntermediateRenameError) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableDownloadResumption);
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(file));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Setup the error injector.
   scoped_refptr<TestFileErrorInjector> injector(
       TestFileErrorInjector::Create(DownloadManagerForShell(shell())));
 
   TestFileErrorInjector::FileErrorInfo err = {
     url.spec(),
     TestFileErrorInjector::FILE_OPERATION_RENAME_UNIQUIFY,
     0,
     DOWNLOAD_INTERRUPT_REASON_FILE_NO_SPACE
@@ skipping 30 matching lines @@
   DownloadUpdatedObserver completion_observer(
       download, base::Bind(DownloadCompleteFilter));
   download->Resume();
   completion_observer.WaitForEvent();
   EXPECT_EQ(download->GetState(), DownloadItem::COMPLETE);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadContentTest, ResumeWithFileFinalRenameError) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableDownloadResumption);
-  base::FilePath file(FILE_PATH_LITERAL("download-test.lib"));
-  GURL url(net::URLRequestMockHTTPJob::GetMockUrl(file));
+  GURL url(net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
 
   // Setup the error injector.
   scoped_refptr<TestFileErrorInjector> injector(
       TestFileErrorInjector::Create(DownloadManagerForShell(shell())));
 
   DownloadManagerForShell(shell())->RemoveAllDownloads();
   TestFileErrorInjector::FileErrorInfo err = {
     url.spec(),
     TestFileErrorInjector::FILE_OPERATION_RENAME_ANNOTATE,
     0,
@@ skipping 93 matching lines @@
     RunAllPendingInMessageLoop();
 
     // The intermediate file should now be gone.
     EXPECT_FALSE(base::PathExists(intermediate_path));
   }
 
   // A completed download shouldn't delete the downloaded file when it is
   // removed.
   {
     // Start the second download and wait until it's done.
-    base::FilePath file2(FILE_PATH_LITERAL("download-test.lib"));
-    GURL url2(net::URLRequestMockHTTPJob::GetMockUrl(file2));
+    GURL url2(net::URLRequestMockHTTPJob::GetMockUrl("download-test.lib"));
     scoped_ptr<DownloadTestObserver> completion_observer(
         CreateWaiter(shell(), 1));
     DownloadItem* download(StartDownloadAndReturnItem(url2));
     completion_observer->WaitForFinished();
 
     // The target path should exist.
     base::FilePath target_path(download->GetTargetFilePath());
     EXPECT_TRUE(base::PathExists(target_path));
     download->Remove();
     RunAllPendingInMessageLoop(BrowserThread::FILE);
@@ skipping 254 matching lines @@
 
   std::vector<DownloadItem*> downloads;
   DownloadManagerForShell(shell())->GetAllDownloads(&downloads);
   ASSERT_EQ(1u, downloads.size());
 
   EXPECT_EQ(FILE_PATH_LITERAL("Jumboshrimp.txt"),
             downloads[0]->GetTargetFilePath().BaseName().value());
 }
 
 }  // namespace content