Move view_appcache_internals_job to content/browser/appcache/

BUG=338338
TBR=darin@chromium.org

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

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

5 files changed, 29 insertions, 16 deletions

diff --git a/webkit/browser/appcache/view_appcache_internals_job.cc b/content/browser/appcache/view_appcache_internals_job.cc
index 71f4d9e..a0758ea 100644
--- a/webkit/browser/appcache/view_appcache_internals_job.cc
+++ b/content/browser/appcache/view_appcache_internals_job.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "webkit/browser/appcache/view_appcache_internals_job.h"
+#include "content/browser/appcache/view_appcache_internals_job.h"
 
 #include <algorithm>
 #include <string>
@@ -31,7 +31,19 @@
 #include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/appcache/appcache_storage.h"
 
-namespace appcache {
+using appcache::AppCacheGroup;
+using appcache::AppCacheInfo;
+using appcache::AppCacheInfoCollection;
+using appcache::AppCacheInfoVector;
+using appcache::AppCacheService;
+using appcache::AppCacheStorage;
+using appcache::AppCacheStorageReference;
+using appcache::AppCacheResourceInfo;
+using appcache::AppCacheResourceInfoVector;
+using appcache::AppCacheResponseInfo;
+using appcache::AppCacheResponseReader;
+
+namespace content {
 namespace {
 
 const char kErrorMessage[] = "Error in retrieving Application Caches.";
@@ -668,4 +680,4 @@ net::URLRequestJob* ViewAppCacheInternalsJobFactory::CreateJobForRequest(
   return new RedirectToMainPageJob(request, network_delegate, service);
 }
 
-}  // namespace appcache
+}  // namespace content
diff --git a/webkit/browser/appcache/view_appcache_internals_job.h b/content/browser/appcache/view_appcache_internals_job.h
index d247c3e..44aa72c 100644
--- a/webkit/browser/appcache/view_appcache_internals_job.h
+++ b/content/browser/appcache/view_appcache_internals_job.h
@@ -1,12 +1,11 @@
-// 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_VIEW_APPCACHE_INTERNALS_JOB_H_
-#define WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#ifndef CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#define CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
 
 #include "base/basictypes.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace net {
 class NetworkDelegate;
@@ -15,15 +14,17 @@ class URLRequestJob;
 }
 
 namespace appcache {
-
 class AppCacheService;
+}
+
+namespace content {
 
-class WEBKIT_STORAGE_BROWSER_EXPORT ViewAppCacheInternalsJobFactory {
+class ViewAppCacheInternalsJobFactory {
  public:
   static net::URLRequestJob* CreateJobForRequest(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
-      AppCacheService* service);
+      appcache::AppCacheService* service);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ViewAppCacheInternalsJobFactory);
@@ -31,4 +32,4 @@ class WEBKIT_STORAGE_BROWSER_EXPORT ViewAppCacheInternalsJobFactory {
 
 }  // namespace appcache
 
-#endif  // WEBKIT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
+#endif  // CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_H_
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index b2bdcc5..f2ccafb 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -18,6 +18,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "content/browser/appcache/view_appcache_internals_job.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/histogram_internals_request_job.h"
 #include "content/browser/net/view_blob_internals_job_factory.h"
@@ -41,7 +42,6 @@
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "url/url_util.h"
-#include "webkit/browser/appcache/view_appcache_internals_job.h"
 
 using appcache::AppCacheService;
 
@@ -443,7 +443,7 @@ class ChromeProtocolHandler
     // Next check for chrome://appcache-internals/, which uses its own job type.
     if (request->url().SchemeIs(kChromeUIScheme) &&
         request->url().host() == kChromeUIAppCacheInternalsHost) {
-      return appcache::ViewAppCacheInternalsJobFactory::CreateJobForRequest(
+      return ViewAppCacheInternalsJobFactory::CreateJobForRequest(
           request, network_delegate, appcache_service_);
     }
 
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 850dabf..582db49 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -309,6 +309,8 @@
     'browser/appcache/appcache_frontend_proxy.h',
     'browser/appcache/chrome_appcache_service.cc',
     'browser/appcache/chrome_appcache_service.h',
+    'browser/appcache/view_appcache_internals_job.h',
+    'browser/appcache/view_appcache_internals_job.cc',
     'browser/browser_child_process_host_impl.cc',
     'browser/browser_child_process_host_impl.h',
     'browser/browser_context.cc',
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
index 1cbcdc4..76cb84f 100644
--- a/webkit/storage_browser.gyp
+++ b/webkit/storage_browser.gyp
@@ -65,8 +65,6 @@
         'browser/appcache/appcache_url_request_job.h',
         'browser/appcache/manifest_parser.cc',
         'browser/appcache/manifest_parser.h',
-        'browser/appcache/view_appcache_internals_job.h',
-        'browser/appcache/view_appcache_internals_job.cc',
         'browser/blob/blob_data_handle.cc',
         'browser/blob/blob_data_handle.h',
         'browser/blob/blob_storage_context.cc',