Have AppCache code go through the content embedder API for content settings checks.

content/browser/appcache/chrome_appcache_service.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 "content/browser/appcache/chrome_appcache_service.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "content/browser/content_browser_client.h"
 #include "content/common/notification_service.h"
 #include "net/base/net_errors.h"
 #include "webkit/appcache/appcache_thread.h"
 
 static bool has_initialized_thread_ids;
 
 namespace {
 
 // Used to defer deleting of local storage until the destructor has finished.
 void DeleteLocalStateOnIOThread(FilePath cache_path) {
   // Post the actual deletion to the DB thread to ensure it happens after the
   // database file has been closed.
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       NewRunnableFunction<bool(*)(const FilePath&, bool), FilePath, bool>(
           &file_util::Delete, cache_path, true));
 }
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
 
 ChromeAppCacheService::ChromeAppCacheService()
-    : clear_local_state_on_exit_(false) {
+    : resource_context_(NULL), clear_local_state_on_exit_(false) {
 }
 
 void ChromeAppCacheService::InitializeOnIOThread(
     const FilePath& cache_path,
-    scoped_refptr<HostContentSettingsMap> content_settings_map,
+    const content::ResourceContext* resource_context,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
     bool clear_local_state_on_exit) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!has_initialized_thread_ids) {
     has_initialized_thread_ids = true;
     appcache::AppCacheThread::Init(BrowserThread::DB, BrowserThread::IO);
   }
 
   cache_path_ = cache_path;
-  host_contents_settings_map_ = content_settings_map;
+  resource_context_ = resource_context;
   registrar_.Add(
       this, NotificationType::PURGE_MEMORY, NotificationService::AllSources());
   SetClearLocalStateOnExit(clear_local_state_on_exit);
 
   // Init our base class.
   Initialize(cache_path_,
              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   set_appcache_policy(this);
   set_special_storage_policy(special_storage_policy);
 }
@@ skipping 16 matching lines @@
         NewRunnableMethod(this,
                           &ChromeAppCacheService::SetClearLocalStateOnExit,
                           clear_local_state));
     return;
   }
   clear_local_state_on_exit_ = clear_local_state;
 }
 
 bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  ContentSetting setting = host_contents_settings_map_->GetContentSetting(
-      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
-  DCHECK(setting != CONTENT_SETTING_DEFAULT);
   // We don't prompt for read access.
-  return setting != CONTENT_SETTING_BLOCK;
+  return content::GetContentClient()->browser()->AllowAppCache(
+      manifest_url, resource_context_);
 }
 
 int ChromeAppCacheService::CanCreateAppCache(
     const GURL& manifest_url, net::CompletionCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  ContentSetting setting = host_contents_settings_map_->GetContentSetting(
-      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
-  DCHECK(setting != CONTENT_SETTING_DEFAULT);
-  return (setting != CONTENT_SETTING_BLOCK) ? net::OK :
-                                              net::ERR_ACCESS_DENIED;
+  return content::GetContentClient()->browser()->AllowAppCache(
+      manifest_url, resource_context_) ? net::OK : net::ERR_ACCESS_DENIED;
 }
 
 void ChromeAppCacheService::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(type == NotificationType::PURGE_MEMORY);
   PurgeMemory();
 }
 
@@ skipping 14 matching lines @@
     const tracked_objects::Location& from_here,
     Task* task) {
   return BrowserThread::PostTask(ToBrowserThreadID(id), from_here, task);
 }
 
 bool AppCacheThread::CurrentlyOn(int id) {
   return BrowserThread::CurrentlyOn(ToBrowserThreadID(id));
 }
 
 }  // namespace appcache