Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_service_impl.h

Index: content/browser/appcache/appcache_service_impl.h
diff --git a/webkit/browser/appcache/appcache_service_impl.h b/content/browser/appcache/appcache_service_impl.h
similarity index 93%
rename from webkit/browser/appcache/appcache_service_impl.h
rename to content/browser/appcache/appcache_service_impl.h
index 12524ec6f6f713d788c213340755b3a93c478b52..ef4f060e930b81772c66ebdcaec65e893bcedd33 100644
--- a/webkit/browser/appcache/appcache_service_impl.h
+++ b/content/browser/appcache/appcache_service_impl.h
@@ -2,8 +2,8 @@
 // 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_IMPL_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
 
 #include <map>
 #include <set>
@@ -14,12 +14,12 @@
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "content/common/appcache_interfaces.h"
+#include "content/common/content_export.h"
+#include "content/public/browser/appcache_service.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace net {
 class URLRequestContext;
@@ -40,7 +40,7 @@ namespace quota {
 class SpecialStoragePolicy;
 }
 
-namespace appcache {
+namespace content {
 
 class AppCacheBackendImpl;
 class AppCacheExecutableHandlerFactory;
@@ -50,7 +50,7 @@ class AppCacheStorage;
 
 // Refcounted container to manage the lifetime of the old storage instance
 // during Reinitialization.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheStorageReference
+class CONTENT_EXPORT AppCacheStorageReference
     : public base::RefCounted<AppCacheStorageReference> {
 public:
   AppCacheStorage* storage() const { return storage_.get(); }
@@ -66,11 +66,11 @@ private:
 // 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.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheServiceImpl
+class CONTENT_EXPORT AppCacheServiceImpl
     : public AppCacheService {
  public:
 
-  class WEBKIT_STORAGE_BROWSER_EXPORT Observer {
+  class CONTENT_EXPORT Observer {
    public:
     // An observer method to inform consumers of reinitialzation. Managing
     // the lifetime of the old storage instance is a delicate process.
@@ -222,6 +222,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheServiceImpl
   DISALLOW_COPY_AND_ASSIGN(AppCacheServiceImpl);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_SERVICE_IMPL_H_