Move appcache_interceptor from webkit/ to content/

BUG=338338
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/214883003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260882 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 87 insertions, 38 deletions

diff --git a/webkit/browser/appcache/appcache_interceptor.cc b/content/browser/appcache/appcache_interceptor.cc
index 20d7668..3a2c2bd 100644
--- a/webkit/browser/appcache/appcache_interceptor.cc
+++ b/content/browser/appcache/appcache_interceptor.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "webkit/browser/appcache/appcache_interceptor.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 
 #include "webkit/browser/appcache/appcache_backend_impl.h"
 #include "webkit/browser/appcache/appcache_host.h"
@@ -11,7 +11,14 @@
 #include "webkit/browser/appcache/appcache_url_request_job.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
 
-namespace appcache {
+using appcache::AppCacheBackendImpl;
+using appcache::AppCacheHost;
+using appcache::AppCacheRequestHandler;
+using appcache::AppCacheService;
+using appcache::kNoCacheId;
+using appcache::kNoHostId;
+
+namespace content {
 
 // static
 AppCacheInterceptor* AppCacheInterceptor::GetInstance() {
@@ -118,4 +125,4 @@ net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
   return handler->MaybeLoadFallbackForResponse(request, network_delegate);
 }
 
-}  // namespace appcache
+}  // namespace content
diff --git a/webkit/browser/appcache/appcache_interceptor.h b/content/browser/appcache/appcache_interceptor.h
index 9ae223c..bb21b2f 100644
--- a/webkit/browser/appcache/appcache_interceptor.h
+++ b/content/browser/appcache/appcache_interceptor.h
@@ -1,24 +1,26 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
 
 #include "base/memory/singleton.h"
+#include "content/common/content_export.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/resource_type.h"
 
 namespace appcache {
-
 class AppCacheRequestHandler;
 class AppCacheService;
+}
+
+namespace content {
 
 // An interceptor to hijack requests and potentially service them out of
 // the appcache.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInterceptor
+class CONTENT_EXPORT AppCacheInterceptor
     : public net::URLRequest::Interceptor {
  public:
   // Registers a singleton instance with the net library.
@@ -29,7 +31,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInterceptor
 
   // Must be called to make a request eligible for retrieval from an appcache.
   static void SetExtraRequestInfo(net::URLRequest* request,
-                                  AppCacheService* service,
+                                  appcache::AppCacheService* service,
                                   int process_id,
                                   int host_id,
                                   ResourceType::Type resource_type);
@@ -69,12 +71,12 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInterceptor
   virtual ~AppCacheInterceptor();
 
   static void SetHandler(net::URLRequest* request,
-                         AppCacheRequestHandler* handler);
-  static AppCacheRequestHandler* GetHandler(net::URLRequest* request);
+                         appcache::AppCacheRequestHandler* handler);
+  static appcache::AppCacheRequestHandler* GetHandler(net::URLRequest* request);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheInterceptor);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_INTERCEPTOR_H_
diff --git a/webkit/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc
index 0e364f5..2e682e2 100644
--- a/webkit/browser/appcache/appcache_storage_impl_unittest.cc
+++ b/content/browser/appcache/appcache_storage_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
@@ -13,6 +13,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
@@ -28,13 +29,35 @@
 #include "webkit/browser/appcache/appcache_entry.h"
 #include "webkit/browser/appcache/appcache_group.h"
 #include "webkit/browser/appcache/appcache_host.h"
-#include "webkit/browser/appcache/appcache_interceptor.h"
 #include "webkit/browser/appcache/appcache_request_handler.h"
 #include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/appcache/appcache_storage_impl.h"
 #include "webkit/browser/quota/quota_manager.h"
 
-namespace appcache {
+using appcache::FALLBACK_NAMESPACE;
+using appcache::NETWORK_NAMESPACE;
+using appcache::AppCacheBackendImpl;
+using appcache::AppCacheDatabase;
+using appcache::AppCacheEntry;
+using appcache::AppCacheFrontend;
+using appcache::AppCacheHost;
+using appcache::AppCacheInfo;
+using appcache::AppCacheGroup;
+using appcache::AppCacheService;
+using appcache::AppCacheStorage;
+using appcache::AppCacheStorageImpl;
+using appcache::AppCacheStorageReference;
+using appcache::AppCache;
+using appcache::ErrorDetails;
+using appcache::EventID;
+using appcache::kNoCacheId;
+using appcache::kNoResponseId;
+using appcache::INTERCEPT_NAMESPACE;
+using appcache::LogLevel;
+using appcache::Namespace;
+using appcache::Status;
+
+namespace content {
 
 namespace {
 
@@ -1598,7 +1621,7 @@ class AppCacheStorageImplTest : public testing::Test {
     MockAppCacheFrontend() : error_event_was_raised_(false) {}
 
     virtual void OnCacheSelected(
-        int host_id, const appcache::AppCacheInfo& info) OVERRIDE {}
+        int host_id, const AppCacheInfo& info) OVERRIDE {}
     virtual void OnStatusChanged(const std::vector<int>& host_ids,
                                  Status status) OVERRIDE {}
     virtual void OnEventRaised(const std::vector<int>& host_ids,
@@ -1608,7 +1631,7 @@ class AppCacheStorageImplTest : public testing::Test {
         const GURL& url,
         int num_total, int num_complete) OVERRIDE {}
     virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                    const appcache::ErrorDetails& details)
+                                    const ErrorDetails& details)
         OVERRIDE {
       error_event_was_raised_ = true;
     }
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 344d93e..8e56397 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
@@ -25,7 +26,6 @@
 #include "content/public/common/url_constants.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
-#include "webkit/browser/appcache/appcache_interceptor.h"
 
 namespace content {
 
@@ -308,7 +308,7 @@ void CrossSiteResourceHandler::StartCrossSiteTransition(
     transfer_url_chain = request()->url_chain();
     referrer = Referrer(GURL(request()->referrer()), info->GetReferrerPolicy());
 
-    appcache::AppCacheInterceptor::PrepareForCrossSiteTransfer(
+    AppCacheInterceptor::PrepareForCrossSiteTransfer(
         request(), global_id.child_id);
     ResourceDispatcherHostImpl::Get()->MarkAsTransferredNavigation(global_id);
   }
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 9234315..61fc35b 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -23,6 +23,7 @@
 #include "base/metrics/sparse_histogram.h"
 #include "base/stl_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/cert_store_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ -87,7 +88,6 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
-#include "webkit/browser/appcache/appcache_interceptor.h"
 #include "webkit/common/blob/blob_data.h"
 #include "webkit/browser/blob/blob_data_handle.h"
 #include "webkit/browser/blob/blob_storage_context.h"
@@ -797,7 +797,7 @@ void ResourceDispatcherHostImpl::DidFinishLoading(ResourceLoader* loader) {
 
 void ResourceDispatcherHostImpl::OnInit() {
   scheduler_.reset(new ResourceScheduler);
-  appcache::AppCacheInterceptor::EnsureRegistered();
+  AppCacheInterceptor::EnsureRegistered();
 }
 
 void ResourceDispatcherHostImpl::OnShutdown() {
@@ -958,7 +958,7 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer(
     }
   }
 
-  appcache::AppCacheInterceptor::CompleteCrossSiteTransfer(
+  AppCacheInterceptor::CompleteCrossSiteTransfer(
       loader->request(),
       child_id,
       request_data.appcache_host_id);
@@ -1137,7 +1137,7 @@ void ResourceDispatcherHostImpl::BeginRequest(
       request_data.resource_type);
 
   // Have the appcache associate its extra info with the request.
-  appcache::AppCacheInterceptor::SetExtraRequestInfo(
+  AppCacheInterceptor::SetExtraRequestInfo(
       new_request.get(), filter_->appcache_service(), child_id,
       request_data.appcache_host_id, request_data.resource_type);
 
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 02e9a1c..6bab366 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
+#include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/loader/cross_site_resource_handler.h"
 #include "content/browser/loader/detachable_resource_handler.h"
@@ -29,7 +30,6 @@
 #include "net/http/http_response_headers.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/url_request_status.h"
-#include "webkit/browser/appcache/appcache_interceptor.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
@@ -54,7 +54,7 @@ void PopulateResourceResponse(net::URLRequest* request,
   response->head.connection_info = response_info.connection_info;
   response->head.was_fetched_via_proxy = request->was_fetched_via_proxy();
   response->head.socket_address = request->GetSocketAddress();
-  appcache::AppCacheInterceptor::GetExtraResponseInfo(
+  AppCacheInterceptor::GetExtraResponseInfo(
       request,
       &response->head.appcache_id,
       &response->head.appcache_manifest_url);
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 2785b7c..7286960 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -308,6 +308,8 @@
     'browser/appcache/appcache_dispatcher_host.h',
     'browser/appcache/appcache_frontend_proxy.cc',
     'browser/appcache/appcache_frontend_proxy.h',
+    'browser/appcache/appcache_interceptor.cc',
+    'browser/appcache/appcache_interceptor.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
     'browser/appcache/view_appcache_internals_job.h',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index e1fe546..37a5463 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -333,6 +333,7 @@
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         'browser/accessibility/browser_accessibility_manager_unittest.cc',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
+        'browser/appcache/appcache_storage_impl_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/browser_thread_unittest.cc',
         'browser/browser_url_handler_impl_unittest.cc',
@@ -599,7 +600,6 @@
         '../webkit/browser/appcache/appcache_request_handler_unittest.cc',
         '../webkit/browser/appcache/appcache_response_unittest.cc',
         '../webkit/browser/appcache/appcache_service_unittest.cc',
-        '../webkit/browser/appcache/appcache_storage_impl_unittest.cc',
         '../webkit/browser/appcache/appcache_storage_unittest.cc',
         '../webkit/browser/appcache/appcache_unittest.cc',
         '../webkit/browser/appcache/appcache_update_job_unittest.cc',
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index f4e8c40..be637e6 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -46,7 +46,6 @@ class StackTrace;
 // Temporary layering violation to allow existing users of a deprecated
 // interface.
 namespace appcache {
-class AppCacheInterceptor;
 class AppCacheRequestHandlerTest;
 class AppCacheURLRequestJobTest;
 }
@@ -54,6 +53,7 @@ class AppCacheURLRequestJobTest;
 // Temporary layering violation to allow existing users of a deprecated
 // interface.
 namespace content {
+class AppCacheInterceptor;
 class BlobURLRequestJobTest;
 class FileSystemDirURLRequestJobTest;
 class FileSystemURLRequestJobTest;
@@ -168,9 +168,9 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
     friend class ::ChildProcessSecurityPolicyTest;
     friend class TestInterceptor;
     friend class URLRequestFilter;
-    friend class appcache::AppCacheInterceptor;
     friend class appcache::AppCacheRequestHandlerTest;
     friend class appcache::AppCacheURLRequestJobTest;
+    friend class content::AppCacheInterceptor;
     friend class content::BlobURLRequestJobTest;
     friend class content::FileSystemDirURLRequestJobTest;
     friend class content::FileSystemURLRequestJobTest;
diff --git a/webkit/browser/appcache/appcache.h b/webkit/browser/appcache/appcache.h
index ea13722..91de284 100644
--- a/webkit/browser/appcache/appcache.h
+++ b/webkit/browser/appcache/appcache.h
@@ -22,6 +22,10 @@ namespace net {
 class IOBuffer;
 }
 
+namespace content {
+class AppCacheStorageImplTest;
+}
+
 namespace appcache {
 
 class AppCacheExecutableHandler;
@@ -142,7 +146,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
  private:
   friend class AppCacheGroup;
   friend class AppCacheHost;
-  friend class AppCacheStorageImplTest;
+  friend class content::AppCacheStorageImplTest;
   friend class AppCacheUpdateJobTest;
   friend class base::RefCounted<AppCache>;
 
diff --git a/webkit/browser/appcache/appcache_database.h b/webkit/browser/appcache/appcache_database.h
index e647575..ea1d479 100644
--- a/webkit/browser/appcache/appcache_database.h
+++ b/webkit/browser/appcache/appcache_database.h
@@ -25,6 +25,10 @@ class Statement;
 class StatementID;
 }
 
+namespace content {
+class AppCacheStorageImplTest;
+}
+
 namespace appcache {
 
 class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
@@ -208,7 +212,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDatabase {
   bool is_recreating_;
   bool was_corruption_detected_;
 
-  friend class AppCacheStorageImplTest;
+  friend class content::AppCacheStorageImplTest;
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, CacheRecords);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, EntryRecords);
   FRIEND_TEST_ALL_PREFIXES(AppCacheDatabaseTest, QuickIntegrityCheck);
diff --git a/webkit/browser/appcache/appcache_host.h b/webkit/browser/appcache/appcache_host.h
index 7bbb1f2..f21e32b 100644
--- a/webkit/browser/appcache/appcache_host.h
+++ b/webkit/browser/appcache/appcache_host.h
@@ -21,6 +21,10 @@ namespace net {
 class URLRequest;
 }  // namespace net
 
+namespace content {
+class AppCacheStorageImplTest;
+}
+
 namespace appcache {
 
 class AppCache;
@@ -291,7 +295,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheHost
   // First party url to be used in policy checks.
   GURL first_party_url_;
 
-  friend class AppCacheStorageImplTest;
+  friend class content::AppCacheStorageImplTest;
   friend class AppCacheRequestHandlerTest;
   friend class AppCacheUpdateJobTest;
   FRIEND_TEST_ALL_PREFIXES(AppCacheTest, CleanupUnusedCache);
diff --git a/webkit/browser/appcache/appcache_service.h b/webkit/browser/appcache/appcache_service.h
index 1755eee..f81a409 100644
--- a/webkit/browser/appcache/appcache_service.h
+++ b/webkit/browser/appcache/appcache_service.h
@@ -29,6 +29,10 @@ class FilePath;
 class MessageLoopProxy;
 }
 
+namespace content {
+class AppCacheStorageImplTest;
+}
+
 namespace quota {
 class SpecialStoragePolicy;
 }
@@ -195,7 +199,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheService {
   bool force_keep_session_state() const { return force_keep_session_state_; }
 
  protected:
-  friend class AppCacheStorageImplTest;
+  friend class content::AppCacheStorageImplTest;
   friend class AppCacheServiceTest;
   FRIEND_TEST_ALL_PREFIXES(AppCacheServiceTest, ScheduleReinitialize);
 
diff --git a/webkit/browser/appcache/appcache_storage_impl.h b/webkit/browser/appcache/appcache_storage_impl.h
index 482bb15..38f71b5 100644
--- a/webkit/browser/appcache/appcache_storage_impl.h
+++ b/webkit/browser/appcache/appcache_storage_impl.h
@@ -21,6 +21,7 @@
 #include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace content {
+class AppCacheStorageImplTest;
 class ChromeAppCacheServiceTest;
 }
 
@@ -171,7 +172,7 @@ class AppCacheStorageImpl : public AppCacheStorage {
   std::deque<base::Closure> pending_simple_tasks_;
   base::WeakPtrFactory<AppCacheStorageImpl> weak_factory_;
 
-  friend class AppCacheStorageImplTest;
+  friend class content::AppCacheStorageImplTest;
   friend class content::ChromeAppCacheServiceTest;
 };
 
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
index 76cb84f..61b74e7 100644
--- a/webkit/storage_browser.gyp
+++ b/webkit/storage_browser.gyp
@@ -42,8 +42,6 @@
         'browser/appcache/appcache_histograms.h',
         'browser/appcache/appcache_host.cc',
         'browser/appcache/appcache_host.h',
-        'browser/appcache/appcache_interceptor.cc',
-        'browser/appcache/appcache_interceptor.h',
         'browser/appcache/appcache_policy.h',
         'browser/appcache/appcache_quota_client.cc',
         'browser/appcache/appcache_quota_client.h',