Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_storage.h

 // Copyright (c) 2012 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_STORAGE_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/appcache/appcache_working_set.h"
+#include "content/common/content_export.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/appcache/appcache_working_set.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 
 class GURL;
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheStorageTest, DelegateReferences);
 FORWARD_DECLARE_TEST(AppCacheStorageTest, UsageMap);
 class AppCacheQuotaClientTest;
 class AppCacheResponseTest;
 class AppCacheStorageTest;
 }
 
-namespace appcache {
+namespace content {
 
 class AppCache;
 class AppCacheEntry;
 class AppCacheGroup;
 class AppCacheResponseReader;
 class AppCacheResponseWriter;
 class AppCacheServiceImpl;
 struct AppCacheInfoCollection;
 struct HttpResponseInfoIOBuffer;
 
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheStorage {
+class CONTENT_EXPORT AppCacheStorage {
  public:
   typedef std::map<GURL, int64> UsageMap;
 
-  class WEBKIT_STORAGE_BROWSER_EXPORT Delegate {
+  class CONTENT_EXPORT Delegate {
    public:
     // If retrieval fails, 'collection' will be NULL.
     virtual void OnAllInfo(AppCacheInfoCollection* collection) {}
 
     // If a load fails the 'cache' will be NULL.
     virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) {}
 
     // If a load fails the 'group' will be NULL.
     virtual void OnGroupLoaded(
         AppCacheGroup* group, const GURL& manifest_url) {}
@@ skipping 262 matching lines @@
 
   // The set of last ids must be retrieved from storage prior to being used.
   static const int64 kUnitializedId;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheStorageTest, DelegateReferences);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheStorageTest, UsageMap);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheStorage);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_