From b23b1b484ab4f78d5c3107126489328fc8352164 Mon Sep 17 00:00:00 2001 From: "penghuang@chromium.org" Date: Fri, 18 May 2012 19:09:16 +0000 Subject: Add schema chrome-extension-resource:// for extension resources. It may be used for bundle JS libraries in future like Google Analytics JS library. Mark a test case flaky for OSX, and reland it. BUG=122987 TEST=unit_tests --gtest_filter=ExtensionFileUtil.* TEST=browser_tests --gtest_filter=ExtensionResourceRequestPolicyTest* Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=137794 Review URL: https://chromiumcodereview.appspot.com/9909019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137918 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/profiles/profile_io_data.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'chrome/browser/profiles') diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 6ea6e86..b137006 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -24,6 +24,7 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/extension_protocols.h" +#include "chrome/browser/extensions/extension_resource_protocols.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" @@ -302,6 +303,7 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { #endif // defined(OS_CHROMEOS) chrome::kBlobScheme, chrome::kFileSystemScheme, + chrome::kExtensionResourceScheme, }; for (size_t i = 0; i < arraysize(kProtocolList); ++i) { if (scheme == kProtocolList[i]) @@ -515,6 +517,10 @@ void ProfileIOData::LazyInitialize() const { profile_params_->extension_info_map)); DCHECK(set_protocol); set_protocol = job_factory_->SetProtocolHandler( + chrome::kExtensionResourceScheme, + CreateExtensionResourceProtocolHandler()); + DCHECK(set_protocol); + set_protocol = job_factory_->SetProtocolHandler( chrome::kChromeUIScheme, ChromeURLDataManagerBackend::CreateProtocolHandler( chrome_url_data_manager_backend_.get())); -- cgit v1.1