| Index: content/browser/appcache/appcache_request_handler.cc
|
| diff --git a/webkit/browser/appcache/appcache_request_handler.cc b/content/browser/appcache/appcache_request_handler.cc
|
| similarity index 95%
|
| rename from webkit/browser/appcache/appcache_request_handler.cc
|
| rename to content/browser/appcache/appcache_request_handler.cc
|
| index 0777044a2dd1aebe408295010654064b1318dddc..2db7a52b161fa2218f0ed94e8a9ad661fdee1b1b 100644
|
| --- a/webkit/browser/appcache/appcache_request_handler.cc
|
| +++ b/content/browser/appcache/appcache_request_handler.cc
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/appcache/appcache_request_handler.h"
|
| +#include "content/browser/appcache/appcache_request_handler.h"
|
|
|
| +#include "content/browser/appcache/appcache.h"
|
| +#include "content/browser/appcache/appcache_backend_impl.h"
|
| +#include "content/browser/appcache/appcache_policy.h"
|
| +#include "content/browser/appcache/appcache_url_request_job.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_job.h"
|
| -#include "webkit/browser/appcache/appcache.h"
|
| -#include "webkit/browser/appcache/appcache_backend_impl.h"
|
| -#include "webkit/browser/appcache/appcache_policy.h"
|
| -#include "webkit/browser/appcache/appcache_url_request_job.h"
|
|
|
| -namespace appcache {
|
| +namespace content {
|
|
|
| AppCacheRequestHandler::AppCacheRequestHandler(
|
| AppCacheHost* host, ResourceType::Type resource_type)
|
| @@ -38,7 +38,8 @@ AppCacheStorage* AppCacheRequestHandler::storage() const {
|
| AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadResource(
|
| net::URLRequest* request, net::NetworkDelegate* network_delegate) {
|
| maybe_load_resource_executed_ = true;
|
| - if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
|
| + if (!host_ || !IsSchemeAndMethodSupportedForAppCache(request) ||
|
| + cache_entry_not_found_)
|
| return NULL;
|
|
|
| // This method can get called multiple times over the life
|
| @@ -86,7 +87,8 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
|
| net::URLRequest* request,
|
| net::NetworkDelegate* network_delegate,
|
| const GURL& location) {
|
| - if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
|
| + if (!host_ || !IsSchemeAndMethodSupportedForAppCache(request) ||
|
| + cache_entry_not_found_)
|
| return NULL;
|
| if (is_main_resource())
|
| return NULL;
|
| @@ -121,7 +123,8 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
|
|
|
| AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse(
|
| net::URLRequest* request, net::NetworkDelegate* network_delegate) {
|
| - if (!host_ || !IsSchemeAndMethodSupported(request) || cache_entry_not_found_)
|
| + if (!host_ || !IsSchemeAndMethodSupportedForAppCache(request) ||
|
| + cache_entry_not_found_)
|
| return NULL;
|
| if (!found_fallback_entry_.has_response_id())
|
| return NULL;
|
| @@ -396,4 +399,4 @@ void AppCacheRequestHandler::OnCacheSelectionComplete(AppCacheHost* host) {
|
| ContinueMaybeLoadSubResource();
|
| }
|
|
|
| -} // namespace appcache
|
| +} // namespace content
|
|
|