Introduce a resource identifier for content settings.

chrome/browser/appcache/chrome_appcache_service.cc

 // Copyright (c) 2010 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 "chrome/browser/appcache/chrome_appcache_service.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/cookie_prompt_modal_dialog_delegate.h"
@@ skipping 62 matching lines @@
 }
 
 // static
 void ChromeAppCacheService::ClearLocalState(const FilePath& profile_path) {
   file_util::Delete(profile_path.Append(chrome::kAppCacheDirname), true);
 }
 
 bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   ContentSetting setting = host_contents_settings_map_->GetContentSetting(
-      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
   DCHECK(setting != CONTENT_SETTING_DEFAULT);
   // We don't prompt for read access.
   return setting != CONTENT_SETTING_BLOCK;
 }
 
 int ChromeAppCacheService::CanCreateAppCache(
     const GURL& manifest_url, net::CompletionCallback* callback) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   ContentSetting setting = host_contents_settings_map_->GetContentSetting(
-      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
   DCHECK(setting != CONTENT_SETTING_DEFAULT);
   if (setting == CONTENT_SETTING_ASK) {
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(this, &ChromeAppCacheService::DoPrompt,
                           manifest_url, callback));
     return net::ERR_IO_PENDING;
   }
   return (setting != CONTENT_SETTING_BLOCK) ? net::OK :
                                               net::ERR_ACCESS_DENIED;
 }
 
 void ChromeAppCacheService::DoPrompt(
     const GURL& manifest_url, net::CompletionCallback* callback) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // The setting may have changed (due to the "remember" option)
   ContentSetting setting = host_contents_settings_map_->GetContentSetting(
-      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES);
+      manifest_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
   if (setting != CONTENT_SETTING_ASK) {
     int rv = (setting != CONTENT_SETTING_BLOCK) ? net::OK :
                                                   net::ERR_ACCESS_DENIED;
     DidPrompt(rv, manifest_url, callback);
     return;
   }
 
   // Show the prompt on top of the current tab.
   Browser* browser = BrowserList::GetLastActive();
   if (!browser || !browser->GetSelectedTabContents()) {
@@ skipping 46 matching lines @@
     const tracked_objects::Location& from_here,
     Task* task) {
   return ChromeThread::PostTask(ToChromeThreadID(id), from_here, task);
 }
 
 bool AppCacheThread::CurrentlyOn(int id) {
   return ChromeThread::CurrentlyOn(ToChromeThreadID(id));
 }
 
 }  // namespace appcache