diff options
Diffstat (limited to 'chrome/browser')
6 files changed, 0 insertions, 125 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 3903ab4..ef593ea 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -149,8 +149,6 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( chrome::kExtensionScheme); - ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( - chrome::kExtensionResourceScheme); extension_event_router_forwarder_ = new ExtensionEventRouterForwarder; diff --git a/chrome/browser/extensions/extension_resource_protocols.cc b/chrome/browser/extensions/extension_resource_protocols.cc deleted file mode 100644 index 2385355..0000000 --- a/chrome/browser/extensions/extension_resource_protocols.cc +++ /dev/null @@ -1,81 +0,0 @@ -// 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 "chrome/browser/extensions/extension_resource_protocols.h" - -#include "base/file_path.h" -#include "base/path_service.h" -#include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension_file_util.h" -#include "content/public/browser/browser_thread.h" -#include "net/url_request/url_request_file_job.h" - -namespace { - -class ExtensionResourcesJob : public net::URLRequestFileJob { - public: - explicit ExtensionResourcesJob(net::URLRequest* request) - : net::URLRequestFileJob(request, FilePath()) { } - - virtual void Start() OVERRIDE; - - protected: - ~ExtensionResourcesJob() { } - - void ResolvePath(); - void ResolvePathDone(); - - private: - content::BrowserThread::ID thread_id_; -}; - -void ExtensionResourcesJob::Start() { - bool result = - content::BrowserThread::GetCurrentThreadIdentifier(&thread_id_); - CHECK(result) << "Can not get thread id."; - content::BrowserThread::PostTask( - content::BrowserThread::FILE, FROM_HERE, - base::Bind(&ExtensionResourcesJob::ResolvePath, this)); -} - -void ExtensionResourcesJob::ResolvePath() { - FilePath root_path; - PathService::Get(chrome::DIR_RESOURCES_EXTENSION, &root_path); - file_path_ = extension_file_util::ExtensionResourceURLToFilePath( - request()->url(), root_path); - content::BrowserThread::PostTask( - thread_id_, FROM_HERE, - base::Bind(&ExtensionResourcesJob::ResolvePathDone, this)); -} - -void ExtensionResourcesJob::ResolvePathDone() { - net::URLRequestFileJob::Start(); -} - -class ExtensionResourceProtocolHandler - : public net::URLRequestJobFactory::ProtocolHandler { - public: - ExtensionResourceProtocolHandler() {} - virtual ~ExtensionResourceProtocolHandler() {} - - virtual net::URLRequestJob* MaybeCreateJob( - net::URLRequest* request) const OVERRIDE; - - private: - DISALLOW_COPY_AND_ASSIGN(ExtensionResourceProtocolHandler); -}; - -// Creates URLRequestJobs for chrome-extension-resource:// URLs. -net::URLRequestJob* -ExtensionResourceProtocolHandler::MaybeCreateJob( - net::URLRequest* request) const { - return new ExtensionResourcesJob(request); -} - -} // namespace - -net::URLRequestJobFactory::ProtocolHandler* -CreateExtensionResourceProtocolHandler() { - return new ExtensionResourceProtocolHandler(); -} diff --git a/chrome/browser/extensions/extension_resource_protocols.h b/chrome/browser/extensions/extension_resource_protocols.h deleted file mode 100644 index a93d67d..0000000 --- a/chrome/browser/extensions/extension_resource_protocols.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_ -#pragma once - -#include "net/url_request/url_request_job_factory.h" - -// Creates the handlers for the chrome-extension-resource:// scheme. -net::URLRequestJobFactory::ProtocolHandler* -CreateExtensionResourceProtocolHandler(); - -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_RESOURCE_PROTOCOLS_H_ diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index a7f57de..7529ada 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -193,17 +193,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("Image failed to load", result); - - GURL nonaccessible_cer_resource( - test_server()->GetURL( - "files/extensions/api_test/extension_resource_request_policy/" - "web_accessible/nonaccessible_chrome_resource_scheme.html")); - ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetSelectedWebContents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(document.title)", - &result)); - EXPECT_EQ("Loading CER:// failed.", result); } IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { @@ -216,8 +205,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Iframe) { "extension_resource_request_policy/web_accessible", "iframe.html")); } - -IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, - ExtensionAccessibleResources) { - ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; -} diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index b137006..6ea6e86 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -24,7 +24,6 @@ #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" @@ -303,7 +302,6 @@ 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]) @@ -517,10 +515,6 @@ 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())); diff --git a/chrome/browser/resources/extension_resource/demo/library.js b/chrome/browser/resources/extension_resource/demo/library.js deleted file mode 100644 index 167786a..0000000 --- a/chrome/browser/resources/extension_resource/demo/library.js +++ /dev/null @@ -1,5 +0,0 @@ -// 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. - -var _demo = {}; |