Move all remaining appcache-related code to content namespace

content/browser/appcache/appcache_storage_impl.cc

 // 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.
 
-#include "webkit/browser/appcache/appcache_storage_impl.h"
+#include "content/browser/appcache/appcache_storage_impl.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
+#include "content/browser/appcache/appcache.h"
+#include "content/browser/appcache/appcache_database.h"
+#include "content/browser/appcache/appcache_entry.h"
+#include "content/browser/appcache/appcache_group.h"
+#include "content/browser/appcache/appcache_histograms.h"
+#include "content/browser/appcache/appcache_quota_client.h"
+#include "content/browser/appcache/appcache_response.h"
+#include "content/browser/appcache/appcache_service_impl.h"
 #include "net/base/cache_type.h"
 #include "net/base/net_errors.h"
 #include "sql/connection.h"
 #include "sql/transaction.h"
-#include "webkit/browser/appcache/appcache.h"
-#include "webkit/browser/appcache/appcache_database.h"
-#include "webkit/browser/appcache/appcache_entry.h"
-#include "webkit/browser/appcache/appcache_group.h"
-#include "webkit/browser/appcache/appcache_histograms.h"
-#include "webkit/browser/appcache/appcache_quota_client.h"
-#include "webkit/browser/appcache/appcache_response.h"
-#include "webkit/browser/appcache/appcache_service_impl.h"
 #include "webkit/browser/quota/quota_client.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 
-namespace appcache {
+namespace content {
 
 // Hard coded default when not using quota management.
 static const int kDefaultQuota = 5 * 1024 * 1024;
 
 static const int kMaxDiskCacheSize = 250 * 1024 * 1024;
 static const int kMaxMemDiskCacheSize = 10 * 1024 * 1024;
 static const base::FilePath::CharType kDiskCacheDirectoryName[] =
     FILE_PATH_LITERAL("Cache");
 
 namespace {
@@ skipping 787 matching lines @@
 
 class NetworkNamespaceHelper {
  public:
   explicit NetworkNamespaceHelper(AppCacheDatabase* database)
       : database_(database) {
   }
 
   bool IsInNetworkNamespace(const GURL& url, int64 cache_id) {
     typedef std::pair<WhiteListMap::iterator, bool> InsertResult;
     InsertResult result = namespaces_map_.insert(
-        WhiteListMap::value_type(cache_id, NamespaceVector()));
+        WhiteListMap::value_type(cache_id, AppCacheNamespaceVector()));
     if (result.second)
       GetOnlineWhiteListForCache(cache_id, &result.first->second);
     return AppCache::FindNamespace(result.first->second, url) != NULL;
   }
 
  private:
   void GetOnlineWhiteListForCache(
-      int64 cache_id, NamespaceVector* namespaces) {
+      int64 cache_id, AppCacheNamespaceVector* namespaces) {
     DCHECK(namespaces && namespaces->empty());
     typedef std::vector<AppCacheDatabase::OnlineWhiteListRecord>
         WhiteListVector;
     WhiteListVector records;
     if (!database_->FindOnlineWhiteListForCache(cache_id, &records))
       return;
     WhiteListVector::const_iterator iter = records.begin();
     while (iter != records.end()) {
       namespaces->push_back(
-            Namespace(APPCACHE_NETWORK_NAMESPACE, iter->namespace_url, GURL(),
-                      iter->is_pattern));
+            AppCacheNamespace(APPCACHE_NETWORK_NAMESPACE, iter->namespace_url,
+                GURL(), iter->is_pattern));
       ++iter;
     }
   }
 
   // Key is cache id
-  typedef std::map<int64, NamespaceVector> WhiteListMap;
+  typedef std::map<int64, AppCacheNamespaceVector> WhiteListMap;
   WhiteListMap namespaces_map_;
   AppCacheDatabase* database_;
 };
 
 }  // namespace
 
 class AppCacheStorageImpl::FindMainResponseTask : public DatabaseTask {
  public:
   FindMainResponseTask(AppCacheStorageImpl* storage,
                        const GURL& url,
@@ skipping 970 matching lines @@
                  cache_directory_, true),
       base::Bind(&AppCacheStorageImpl::CallScheduleReinitialize,
                   weak_factory_.GetWeakPtr()));
 }
 
 void AppCacheStorageImpl::CallScheduleReinitialize() {
   service_->ScheduleReinitialize();
   // note: 'this' may be deleted at this point.
 }
 
-}  // namespace appcache
+}  // namespace content