Pass in the HostContentSettingsMap to the CookieModalDialog so IsValid can ma...

chrome/browser/in_process_webkit/dom_storage_permission_request.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/in_process_webkit/dom_storage_permission_request.h"
 
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/message_box_handler.h"
 
 DOMStoragePermissionRequest::DOMStoragePermissionRequest(
     const GURL& url,
     const string16& key,
     const string16& value,
     HostContentSettingsMap* settings)
     : url_(url),
       key_(key),
       value_(value),
       event_(true, false),  // manual reset, not initially signaled
       host_content_settings_map_(settings) {
 }
 
 ContentSetting DOMStoragePermissionRequest::WaitOnResponse() {
   event_.Wait();
   return response_content_setting_;
 }
 
 // static
 void DOMStoragePermissionRequest::PromptUser(
-    DOMStoragePermissionRequest* dom_storage_permission_request) {
+    DOMStoragePermissionRequest* request) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // Cookie settings may have changed.
   ContentSetting setting =
-      dom_storage_permission_request->host_content_settings_map_->
-          GetContentSetting(dom_storage_permission_request->url(),
-                            CONTENT_SETTINGS_TYPE_COOKIES);
+      request->host_content_settings_map_->GetContentSetting(
+          request->url_, CONTENT_SETTINGS_TYPE_COOKIES);
   if (setting != CONTENT_SETTING_ASK) {
-    dom_storage_permission_request->SendResponse(setting, false);
+    request->SendResponse(setting);
     return;
   }
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser || !browser->GetSelectedTabContents()) {
-    dom_storage_permission_request->SendResponse(CONTENT_SETTING_BLOCK, false);
+    request->SendResponse(CONTENT_SETTING_BLOCK);
     return;
   }
 
 #if defined(OS_WIN)
   RunLocalStoragePrompt(browser->GetSelectedTabContents(),
-                        dom_storage_permission_request->url(),
-                        dom_storage_permission_request->key(),
-                        dom_storage_permission_request->value(),
-                        dom_storage_permission_request);
+                        request->host_content_settings_map_, request->url_,
+                        request->key_, request->value_, request);
 #else
   // TODO(darin): Enable prompting for other ports.
-  dom_storage_permission_request->SendResponse(CONTENT_SETTING_BLOCK, false);
+  request->SendResponse(CONTENT_SETTING_BLOCK);
 #endif
 }
 
-void DOMStoragePermissionRequest::AllowSiteData(bool remember,
-                                                bool session_expire) {
-  // The session_expire parameter is not relevant.
-  SendResponse(CONTENT_SETTING_ALLOW, remember);
+void DOMStoragePermissionRequest::AllowSiteData(bool session_expire) {
+  SendResponse(CONTENT_SETTING_ALLOW);
 }
 
-void DOMStoragePermissionRequest::BlockSiteData(bool remember) {
-  SendResponse(CONTENT_SETTING_BLOCK, remember);
+void DOMStoragePermissionRequest::BlockSiteData() {
+  SendResponse(CONTENT_SETTING_BLOCK);
 }
 
-void DOMStoragePermissionRequest::SendResponse(ContentSetting content_setting,
-                                               bool remember) {
+void DOMStoragePermissionRequest::SendResponse(
+    ContentSetting content_setting) {
   response_content_setting_ = content_setting;
-  if (remember) {
-    host_content_settings_map_->SetContentSetting(
-        url_.host(), CONTENT_SETTINGS_TYPE_COOKIES, content_setting);
-  }
   event_.Signal();
 }