Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache.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_H_
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
+#include "content/browser/appcache/appcache_database.h"
+#include "content/browser/appcache/appcache_entry.h"
+#include "content/browser/appcache/manifest_parser.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_entry.h"
-#include "webkit/browser/appcache/manifest_parser.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
 
 namespace net {
 class IOBuffer;
 }
 
 namespace content {
 FORWARD_DECLARE_TEST(AppCacheTest, InitializeWithManifest);

[jam, 2014/06/25 21:51:14]

i dont think you need these lines anymore? (also in other files)

 FORWARD_DECLARE_TEST(AppCacheTest, ToFromDatabaseRecords);
 class AppCacheTest;
 class AppCacheStorageImplTest;
 class AppCacheUpdateJobTest;
 }
 
-namespace appcache {
+namespace content {

[jam, 2014/06/25 21:51:14]

nit: merge this with the section above (also in other files)

 
 class AppCacheExecutableHandler;
 class AppCacheGroup;
 class AppCacheHost;
 class AppCacheStorage;
 
 // Set of cached resources for an application. A cache exists as long as a
 // host is associated with it, the cache is in an appcache group or the
 // cache is being created during an appcache upate.
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
+class CONTENT_EXPORT AppCache
     : public base::RefCounted<AppCache> {
  public:
   typedef std::map<GURL, AppCacheEntry> EntryMap;
   typedef std::set<AppCacheHost*> AppCacheHosts;
 
   AppCache(AppCacheStorage* storage, int64 cache_id);
 
   int64 cache_id() const { return cache_id_; }
 
   AppCacheGroup* owning_group() const { return owning_group_.get(); }
@@ skipping 82 matching lines @@
       std::vector<AppCacheDatabase::OnlineWhiteListRecord>* whitelists);
 
   bool FindResponseForRequest(const GURL& url,
       AppCacheEntry* found_entry, GURL* found_intercept_namespace,
       AppCacheEntry* found_fallback_entry, GURL* found_fallback_namespace,
       bool* found_network_namespace);
 
   // Populates the 'infos' vector with an element per entry in the appcache.
   void ToResourceInfoVector(AppCacheResourceInfoVector* infos) const;
 
-  static const Namespace* FindNamespace(
-      const NamespaceVector& namespaces,
+  static const AppCacheNamespace* FindNamespace(
+      const AppCacheNamespaceVector& namespaces,
       const GURL& url);
 
  private:
   friend class AppCacheGroup;
   friend class AppCacheHost;
   friend class content::AppCacheTest;
   friend class content::AppCacheStorageImplTest;
   friend class content::AppCacheUpdateJobTest;
   friend class base::RefCounted<AppCache>;
 
   ~AppCache();
 
   // Use AppCacheGroup::Add/RemoveCache() to manipulate owning group.
   void set_owning_group(AppCacheGroup* group) { owning_group_ = group; }
 
   // FindResponseForRequest helpers
-  const Namespace* FindInterceptNamespace(const GURL& url) {
+  const AppCacheNamespace* FindInterceptNamespace(const GURL& url) {
     return FindNamespace(intercept_namespaces_, url);
   }
-  const Namespace* FindFallbackNamespace(const GURL& url) {
+  const AppCacheNamespace* FindFallbackNamespace(const GURL& url) {
     return FindNamespace(fallback_namespaces_, url);
   }
   bool IsInNetworkNamespace(const GURL& url) {
     return FindNamespace(online_whitelist_namespaces_, url) != NULL;
   }
 
-  GURL GetNamespaceEntryUrl(const NamespaceVector& namespaces,
+  GURL GetNamespaceEntryUrl(const AppCacheNamespaceVector& namespaces,
                             const GURL& namespace_url) const;
 
   // Use AppCacheHost::Associate*Cache() to manipulate host association.
   void AssociateHost(AppCacheHost* host) {
     associated_hosts_.insert(host);
   }
   void UnassociateHost(AppCacheHost* host);
 
   const int64 cache_id_;
   scoped_refptr<AppCacheGroup> owning_group_;
   AppCacheHosts associated_hosts_;
 
   EntryMap entries_;    // contains entries of all types
 
-  NamespaceVector intercept_namespaces_;
-  NamespaceVector fallback_namespaces_;
-  NamespaceVector online_whitelist_namespaces_;
+  AppCacheNamespaceVector intercept_namespaces_;
+  AppCacheNamespaceVector fallback_namespaces_;
+  AppCacheNamespaceVector online_whitelist_namespaces_;
   bool online_whitelist_all_;
 
   bool is_complete_;
 
   // when this cache was last updated
   base::Time update_time_;
 
   int64 cache_size_;
 
   typedef std::map<int64, AppCacheExecutableHandler*> HandlerMap;
   HandlerMap executable_handlers_;
 
   // to notify storage when cache is deleted
   AppCacheStorage* storage_;
 
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheTest, InitializeWithManifest);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheTest, ToFromDatabaseRecords);
   DISALLOW_COPY_AND_ASSIGN(AppCache);
 };
 
-}  // namespace appcache
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_H_