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

chrome/browser/policy/policy_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "base/bind.h"
@@ skipping 359 matching lines @@
 
 // Downloads a file named |file| and expects it to be saved to |dir|, which
 // must be empty.
 void DownloadAndVerifyFile(
     Browser* browser, const base::FilePath& dir, const base::FilePath& file) {
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(browser->profile());
   content::DownloadTestObserverTerminal observer(
       download_manager, 1,
       content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl(file.MaybeAsASCII()));
   base::FilePath downloaded = dir.Append(file);
   EXPECT_FALSE(base::PathExists(downloaded));
   ui_test_utils::NavigateToURL(browser, url);
   observer.WaitForFinished();
   EXPECT_EQ(
       1u, observer.NumDownloadsSeenInState(content::DownloadItem::COMPLETE));
   EXPECT_TRUE(base::PathExists(downloaded));
   base::FileEnumerator enumerator(dir, false, base::FileEnumerator::FILES);
   EXPECT_EQ(file, enumerator.Next().BaseName());
   EXPECT_EQ(base::FilePath(), enumerator.Next());
@@ skipping 1127 matching lines @@
   // No plugins at startup.
   EXPECT_EQ(0, CountPlugins());
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(contents);
   InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
   ASSERT_TRUE(infobar_service);
   EXPECT_EQ(0u, infobar_service->infobar_count());
 
-  base::FilePath path(FILE_PATH_LITERAL("plugin/quicktime.html"));
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl("plugin/quicktime.html"));
   ui_test_utils::NavigateToURL(browser(), url);
   // This should have triggered the dangerous plugin infobar.
   ASSERT_EQ(1u, infobar_service->infobar_count());
   EXPECT_TRUE(
       infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate());
   // And the plugin isn't running.
   EXPECT_EQ(0, CountPlugins());
 
   // Now set a policy to always authorize this.
   PolicyMap policies;
@@ skipping 188 matching lines @@
   // Verify that the extensions are not installed initially.
   ExtensionService* service = extension_service();
   ASSERT_FALSE(service->GetExtensionById(kImporterId, true));
   ASSERT_FALSE(service->GetExtensionById(kSharedModuleId, true));
 
   // Mock the webstore update URL. This is where the shared module extension
   // will be installed from.
   base::FilePath update_xml_path = base::FilePath(kTestExtensionsDir)
                                        .AppendASCII("policy_shared_module")
                                        .AppendASCII("update.xml");
-  GURL update_xml_url(URLRequestMockHTTPJob::GetMockUrl(update_xml_path));
+  GURL update_xml_url(
+      URLRequestMockHTTPJob::GetMockUrl(update_xml_path.MaybeAsASCII()));
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryUpdateURL, update_xml_url.spec());
   ui_test_utils::NavigateToURL(browser(), update_xml_url);
 
   // Blacklist "*" but force-install the importer extension. The shared module
   // should be automatically installed too.
   base::ListValue blacklist;
   blacklist.AppendString("*");
   base::ListValue forcelist;
   forcelist.AppendString(
@@ skipping 73 matching lines @@
   // Verifies that extensions that are force-installed by policies are
   // installed and can't be uninstalled.
   ExtensionService* service = extension_service();
   ASSERT_FALSE(service->GetExtensionById(kGoodCrxId, true));
 
   // Extensions that are force-installed come from an update URL, which defaults
   // to the webstore. Use a mock URL for this test with an update manifest
   // that includes "good_v1.crx".
   base::FilePath path =
       base::FilePath(kTestExtensionsDir).Append(kGoodV1CrxManifestName);
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl(path.MaybeAsASCII()));
 
   // Setting the forcelist extension should install "good_v1.crx".
   base::ListValue forcelist;
   forcelist.Append(new base::StringValue(
       base::StringPrintf("%s;%s", kGoodCrxId, url.spec().c_str())));
   PolicyMap policies;
   policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(),
                nullptr);
   content::WindowedNotificationObserver observer(
@@ skipping 93 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionRecommendedInstallationMode) {
   // Verifies that extensions that are recommended-installed by policies are
   // installed, can be disabled but not uninstalled.
   ExtensionService* service = extension_service();
   ASSERT_FALSE(service->GetExtensionById(kGoodCrxId, true));
 
   base::FilePath path =
       base::FilePath(kTestExtensionsDir).Append(kGoodV1CrxManifestName);
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl(path.MaybeAsASCII()));
 
   // Setting the forcelist extension should install "good_v1.crx".
   base::DictionaryValue dict_value;
   dict_value.SetString(std::string(kGoodCrxId) + "." +
                            extensions::schema_constants::kInstallationMode,
                        extensions::schema_constants::kNormalInstalled);
   dict_value.SetString(
       std::string(kGoodCrxId) + "." + extensions::schema_constants::kUpdateUrl,
       url.spec());
   PolicyMap policies;
@@ skipping 58 matching lines @@
 // Flaky on windows; http://crbug.com/295729 .
 #if defined(OS_WIN)
 #define MAYBE_ExtensionInstallSources DISABLED_ExtensionInstallSources
 #else
 #define MAYBE_ExtensionInstallSources ExtensionInstallSources
 #endif
 IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_ExtensionInstallSources) {
   extensions::ScopedTestDialogAutoConfirm auto_confirm(
       extensions::ScopedTestDialogAutoConfirm::ACCEPT);
 
-  const GURL install_source_url(URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath(FILE_PATH_LITERAL("extensions/*"))));
-  const GURL referrer_url(URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath(FILE_PATH_LITERAL("policy/*"))));
+  const GURL install_source_url(
+      URLRequestMockHTTPJob::GetMockUrl("extensions/*"));
+  const GURL referrer_url(URLRequestMockHTTPJob::GetMockUrl("policy/*"));
 
   base::ScopedTempDir download_directory;
   ASSERT_TRUE(download_directory.CreateUniqueTempDir());
   DownloadPrefs* download_prefs =
       DownloadPrefs::FromBrowserContext(browser()->profile());
   download_prefs->SetDownloadPath(download_directory.path());
 
-  const GURL download_page_url(URLRequestMockHTTPJob::GetMockUrl(base::FilePath(
-      FILE_PATH_LITERAL("policy/extension_install_sources_test.html"))));
+  const GURL download_page_url(URLRequestMockHTTPJob::GetMockUrl(
+      "policy/extension_install_sources_test.html"));
   ui_test_utils::NavigateToURL(browser(), download_page_url);
 
   // As long as the policy is not present, extensions are considered dangerous.
   content::DownloadTestObserverTerminal download_observer(
       content::BrowserContext::GetDownloadManager(browser()->profile()), 1,
       content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY);
   PerformClick(0, 0);
   download_observer.WaitForFinished();
 
   // Install the policy and trigger another download.
@@ skipping 168 matching lines @@
 // set minimum version requirement is handled well.
 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionMinimumVersionForceInstalled) {
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(browser()->profile());
   extensions::ExtensionPrefs* extension_prefs =
       extensions::ExtensionPrefs::Get(browser()->profile());
 
   // Prepare the update URL for force installing.
   const base::FilePath path =
       base::FilePath(kTestExtensionsDir).Append(kGoodV1CrxManifestName);
-  const GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
+  const GURL url(URLRequestMockHTTPJob::GetMockUrl(path.MaybeAsASCII()));
 
   // Set policy to force-install the extension, it should be installed and
   // enabled.
   content::WindowedNotificationObserver install_observer(
       extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
       content::NotificationService::AllSources());
   EXPECT_FALSE(registry->enabled_extensions().Contains(kGoodCrxId));
   {
     extensions::ExtensionManagementPolicyUpdater management_policy(&provider_);
     management_policy.SetIndividualExtensionAutoInstalled(kGoodCrxId,
@@ skipping 350 matching lines @@
         base::Bind(UndoRedirectHostsToTestData, kURLS, arraysize(kURLS)),
         loop.QuitClosure());
     loop.Run();
   }
 }
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklistSubresources) {
   // Checks that an image with a blacklisted URL is loaded, but an iframe with a
   // blacklisted URL is not.
 
-  GURL main_url = URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath(FILE_PATH_LITERAL("policy/blacklist-subresources.html")));
-  GURL image_url = URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath(FILE_PATH_LITERAL("policy/pixel.png")));
-  GURL subframe_url = URLRequestMockHTTPJob::GetMockUrl(
-      base::FilePath(FILE_PATH_LITERAL("policy/blank.html")));
+  GURL main_url =
+      URLRequestMockHTTPJob::GetMockUrl("policy/blacklist-subresources.html");
+  GURL image_url = URLRequestMockHTTPJob::GetMockUrl("policy/pixel.png");
+  GURL subframe_url = URLRequestMockHTTPJob::GetMockUrl("policy/blank.html");
 
   // Set a blacklist containing the image and the iframe which are used by the
   // main document.
   base::ListValue blacklist;
   blacklist.Append(new base::StringValue(image_url.spec().c_str()));
   blacklist.Append(new base::StringValue(subframe_url.spec().c_str()));
   PolicyMap policies;
   policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
                nullptr);
@@ skipping 1388 matching lines @@
                POLICY_SCOPE_USER,
                POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(false),
                NULL);
   UpdateProviderPolicy(policies);
   EXPECT_FALSE(display_manager->unified_desktop_enabled());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace policy