| Index: chrome/browser/extensions/extension_protocols.cc
|
| diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
|
| index edf937bb108b52beb002c6ffb40c1dc355898918..cc2041390f9b10459f395bee86d193ea4d684bc8 100644
|
| --- a/chrome/browser/extensions/extension_protocols.cc
|
| +++ b/chrome/browser/extensions/extension_protocols.cc
|
| @@ -34,7 +34,7 @@ namespace {
|
|
|
| class URLRequestResourceBundleJob : public URLRequestSimpleJob {
|
| public:
|
| - explicit URLRequestResourceBundleJob(URLRequest* request,
|
| + explicit URLRequestResourceBundleJob(net::URLRequest* request,
|
| const FilePath& filename, int resource_id)
|
| : URLRequestSimpleJob(request),
|
| filename_(filename),
|
| @@ -67,7 +67,7 @@ class URLRequestResourceBundleJob : public URLRequestSimpleJob {
|
| };
|
|
|
| // Returns true if an chrome-extension:// resource should be allowed to load.
|
| -bool AllowExtensionResourceLoad(URLRequest* request,
|
| +bool AllowExtensionResourceLoad(net::URLRequest* request,
|
| ChromeURLRequestContext* context,
|
| const std::string& scheme) {
|
| const ResourceDispatcherHostRequestInfo* info =
|
| @@ -142,9 +142,9 @@ bool AllowExtensionResourceLoad(URLRequest* request,
|
|
|
| } // namespace
|
|
|
| -// Factory registered with URLRequest to create URLRequestJobs for extension://
|
| -// URLs.
|
| -static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
|
| +// Factory registered with net::URLRequest to create URLRequestJobs for
|
| +// extension:// URLs.
|
| +static URLRequestJob* CreateExtensionURLRequestJob(net::URLRequest* request,
|
| const std::string& scheme) {
|
| ChromeURLRequestContext* context =
|
| static_cast<ChromeURLRequestContext*>(request->context());
|
| @@ -201,9 +201,9 @@ static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
|
| return new URLRequestFileJob(request, resource_file_path);
|
| }
|
|
|
| -// Factory registered with URLRequest to create URLRequestJobs for
|
| +// Factory registered with net::URLRequest to create URLRequestJobs for
|
| // chrome-user-script:/ URLs.
|
| -static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
|
| +static URLRequestJob* CreateUserScriptURLRequestJob(net::URLRequest* request,
|
| const std::string& scheme) {
|
| ChromeURLRequestContext* context =
|
| static_cast<ChromeURLRequestContext*>(request->context());
|
| @@ -218,8 +218,8 @@ static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
|
| }
|
|
|
| void RegisterExtensionProtocols() {
|
| - URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
|
| - &CreateExtensionURLRequestJob);
|
| - URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
|
| - &CreateUserScriptURLRequestJob);
|
| + net::URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
|
| + &CreateExtensionURLRequestJob);
|
| + net::URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
|
| + &CreateUserScriptURLRequestJob);
|
| }
|
|
|