Move all remaining appcache-related code to content namespace

content/public/browser/appcache_service.h

Index: content/public/browser/appcache_service.h
diff --git a/webkit/browser/appcache/appcache_service.h b/content/public/browser/appcache_service.h
similarity index 83%
rename from webkit/browser/appcache/appcache_service.h
rename to content/public/browser/appcache_service.h
index dc6e33b4308ef35b70a7f784128782788201cddc..2b5012e8875e726dbfc4b49abb8d95d75efe26b1 100644
--- a/webkit/browser/appcache/appcache_service.h
+++ b/content/public/browser/appcache_service.h
@@ -2,23 +2,24 @@
 // 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_SERVICE_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_H_
+#ifndef CONTENT_PUBLIC_BROWSER_APPCACHE_SERVICE_H_
+#define CONTENT_PUBLIC_BROWSER_APPCACHE_SERVICE_H_
 
 #include <map>
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
+#include "content/common/content_export.h"
+#include "content/public/common/appcache_interfaces.h"
+#include "net/base/completion_callback.h"
 
-namespace appcache {
+namespace content {
 
 class AppCacheStorage;
 
 // Refcounted container to avoid copying the collection in callbacks.
-struct WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInfoCollection
+struct CONTENT_EXPORT AppCacheInfoCollection
     : public base::RefCountedThreadSafe<AppCacheInfoCollection> {
   AppCacheInfoCollection();
 
@@ -32,7 +33,7 @@ struct WEBKIT_STORAGE_BROWSER_EXPORT AppCacheInfoCollection
 // Class that manages the application cache service. Sends notifications
 // to many frontends. One instance per user-profile. Each instance has
 // exclusive access to its cache_directory on disk.

[michaeln, 2014/06/17 23:34:28]

The class comment doesn't make as much sense in this context.

-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheService {
+class CONTENT_EXPORT AppCacheService {
  public:
   virtual ~AppCacheService() { }
 
@@ -59,6 +60,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheService {
                                    const net::CompletionCallback& callback) = 0;
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_H_
+#endif  // CONTENT_PUBLIC_BROWSER_APPCACHE_SERVICE_H_