Rename some appcache types in preparation for moving to content namespace

webkit/browser/appcache/appcache_host.cc

 // Copyright (c) 2011 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_host.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "net/url_request/url_request.h"
 #include "webkit/browser/appcache/appcache.h"
 #include "webkit/browser/appcache/appcache_backend_impl.h"
 #include "webkit/browser/appcache/appcache_policy.h"
 #include "webkit/browser/appcache/appcache_request_handler.h"
 #include "webkit/browser/quota/quota_manager_proxy.h"
 
 namespace appcache {
 
 namespace {
 
 void FillCacheInfo(const AppCache* cache,
                    const GURL& manifest_url,
-                   Status status, AppCacheInfo* info) {
+                   AppCacheStatus status, AppCacheInfo* info) {
   info->manifest_url = manifest_url;
   info->status = status;
 
   if (!cache)
     return;
 
   info->cache_id = cache->cache_id();
 
   if (!cache->is_complete())
     return;
@@ skipping 76 matching lines @@
       (manifest_url.GetOrigin() == document_url.GetOrigin())) {
     DCHECK(!first_party_url_.is_empty());
     AppCachePolicy* policy = service()->appcache_policy();
     if (policy &&
         !policy->CanCreateAppCache(manifest_url, first_party_url_)) {
       FinishCacheSelection(NULL, NULL);
       std::vector<int> host_ids(1, host_id_);
       frontend_->OnEventRaised(host_ids, CHECKING_EVENT);
       frontend_->OnErrorEventRaised(
           host_ids,
-          ErrorDetails("Cache creation was blocked by the content policy",
-                       POLICY_ERROR,
-                       GURL(),
-                       0,
-                       false /*is_cross_origin*/));
+          AppCacheErrorDetails(
+              "Cache creation was blocked by the content policy",
+              POLICY_ERROR,
+              GURL(),
+              0,
+              false /*is_cross_origin*/));
       frontend_->OnContentBlocked(host_id_, manifest_url);
       return;
     }
 
     // Note: The client detects if the document was not loaded using HTTP GET
     // and invokes SelectCache without a manifest url, so that detection step
     // is also skipped here. See WebApplicationCacheHostImpl.cc
     set_preferred_manifest_url(manifest_url);
     new_master_entry_url_ = document_url;
     LoadOrCreateGroup(manifest_url);
@@ skipping 170 matching lines @@
   }
   return NULL;
 }
 
 void AppCacheHost::GetResourceList(
     AppCacheResourceInfoVector* resource_infos) {
   if (associated_cache_.get() && associated_cache_->is_complete())
     associated_cache_->ToResourceInfoVector(resource_infos);
 }
 
-Status AppCacheHost::GetStatus() {
+AppCacheStatus AppCacheHost::GetStatus() {
   // 6.9.8 Application cache API
   AppCache* cache = associated_cache();
   if (!cache)
     return UNCACHED;
 
   // A cache without an owning group represents the cache being constructed
   // during the application cache update process.
   if (!cache->owning_group())
     return DOWNLOADING;
 
@@ skipping 210 matching lines @@
   associated_cache_info_pending_ = cache && !cache->is_complete();
   AppCacheInfo info;
   if (cache)
     cache->AssociateHost(this);
 
   FillCacheInfo(cache, manifest_url, GetStatus(), &info);
   frontend_->OnCacheSelected(host_id_, info);
 }
 
 }  // namespace appcache