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

chrome/browser/renderer_host/database_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/renderer_host/database_permission_request.h"
 
 
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/host_content_settings_map.h"
@@ skipping 23 matching lines @@
         ChromeThread::UI, FROM_HERE, NewRunnableMethod(
             this, &DatabasePermissionRequest::RequestPermission));
     return;
   }
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // Cookie settings may have changed.
   ContentSetting setting = host_content_settings_map_->GetContentSetting(
       url_, CONTENT_SETTINGS_TYPE_COOKIES);
   if (setting != CONTENT_SETTING_ASK) {
-    SendResponse(setting, false);
+    SendResponse(setting);
     return;
   }
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser || !browser->GetSelectedTabContents()) {
-    BlockSiteData(false);
+    BlockSiteData();
     return;
   }
 
 #if defined(OS_WIN)
   self_ref_ = this;
   // Will call either AllowSiteData or BlockSiteData which will NULL out our
   // self reference.
-  RunDatabasePrompt(browser->GetSelectedTabContents(), url_,
-                    database_name_, this);
+  RunDatabasePrompt(browser->GetSelectedTabContents(),
+                    host_content_settings_map_, url_, database_name_, this);
 #else
   // TODO(jorlow): Enable prompting for other ports.
-  BlockSiteData(false);
+  BlockSiteData();
 #endif
 }
 
-void DatabasePermissionRequest::AllowSiteData(bool remember,
-                                              bool session_expire) {
-  SendResponse(CONTENT_SETTING_ALLOW, remember);
+void DatabasePermissionRequest::AllowSiteData(bool session_expire) {
+  SendResponse(CONTENT_SETTING_ALLOW);
 }
 
-void DatabasePermissionRequest::BlockSiteData(bool remember) {
-  SendResponse(CONTENT_SETTING_BLOCK, remember);
+void DatabasePermissionRequest::BlockSiteData() {
+  SendResponse(CONTENT_SETTING_BLOCK);
 }
 
-void DatabasePermissionRequest::SendResponse(ContentSetting content_setting,
-                                             bool remember) {
-  if (remember) {
-    host_content_settings_map_->SetContentSetting(
-        url_.host(), CONTENT_SETTINGS_TYPE_COOKIES, content_setting);
-  }
-
+void DatabasePermissionRequest::SendResponse(ContentSetting content_setting) {
   if (content_setting == CONTENT_SETTING_ALLOW) {
     ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, on_allow_.release());
   } else {
     DCHECK(content_setting == CONTENT_SETTING_BLOCK);
     ChromeThread::PostTask(ChromeThread::IO, FROM_HERE, on_block_.release());
   }
 
   // Release all resources.
   on_allow_.reset();
   on_block_.reset();
 
   // This seems safer than possibly being deleted while in method(s) related to
   // this object.  Any thread will do, but UI is always around and can be
   // posted without locking, so we'll ask it to do the release.
   ChromeThread::ReleaseSoon(ChromeThread::UI, FROM_HERE, self_ref_.release());
 }