Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_service_impl.h

 // 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_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>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #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;
 }  // namespace net
 
 namespace base {
 class FilePath;
 class MessageLoopProxy;
 }
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheServiceImplTest, ScheduleReinitialize);
 class AppCacheServiceImplTest;
 class AppCacheStorageImplTest;
 }
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
-namespace appcache {
+namespace content {
 
 class AppCacheBackendImpl;
 class AppCacheExecutableHandlerFactory;
 class AppCacheQuotaClient;
 class AppCachePolicy;
 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(); }
 private:
   friend class AppCacheServiceImpl;
   friend class base::RefCounted<AppCacheStorageReference>;
   AppCacheStorageReference(scoped_ptr<AppCacheStorage> storage);
   ~AppCacheStorageReference();
 
   scoped_ptr<AppCacheStorage> storage_;
 };
 
 // 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.
     // Consumers can keep the old disabled instance alive by hanging on to the
     // ref provided.
     virtual void OnServiceReinitialized(
         AppCacheStorageReference* old_storage_ref) = 0;
     virtual ~Observer() {}
   };
 
@@ skipping 131 matching lines @@
   // If true, nothing (not even session-only data) should be deleted on exit.
   bool force_keep_session_state_;
   base::Time last_reinit_time_;
   base::TimeDelta next_reinit_delay_;
   base::OneShotTimer<AppCacheServiceImpl> reinit_timer_;
   ObserverList<Observer> observers_;
 
   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_