Fixes two bugs in cookie prompting:

. In certain situations we could crash because we weren't letting
  CookiePromptView::Init complete and then attempting to reference
  some NULL fields. I've fixed this by adding AppModalDialog::IsValid
  and moving the logic that was in Init to IsValid. This way we only create
  CookiePromptView when needed.
. We were leaking AppModalDialogs. I've made CookiePromptView own the
  AppModalDialog and delete it when the CookiePromptView is deleted.

BUG=36079
TEST=enable prompting for cookies, go to a bunch of sites make sure
     you don't crash.

Review URL: http://codereview.chromium.org/632006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39328 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 20 deletions

diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc
index 6cc526a..0cd93da 100644
--- a/chrome/browser/views/cookie_prompt_view.cc
+++ b/chrome/browser/views/cookie_prompt_view.cc
@@ -14,9 +14,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cookie_modal_dialog.h"
-#include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/cookie_info_view.h"
 #include "chrome/browser/views/database_open_info_view.h"
@@ -61,6 +59,7 @@ CookiePromptView::CookiePromptView(
 }
 
 CookiePromptView::~CookiePromptView() {
+  delete parent_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -137,24 +136,6 @@ void CookiePromptView::LinkActivated(views::Link* source, int event_flags) {
 // CookiePromptView, private:
 
 void CookiePromptView::Init() {
-  // See if there's still a need for this dialog.  Self destruct if not.
-  HostContentSettingsMap* host_content_settings_map =
-      parent_->tab_contents()->profile()->GetHostContentSettingsMap();
-  ContentSetting content_setting =
-      host_content_settings_map->GetContentSetting(
-          parent_->origin(), CONTENT_SETTINGS_TYPE_COOKIES);
-  if (content_setting != CONTENT_SETTING_ASK) {
-    if (content_setting == CONTENT_SETTING_ALLOW) {
-      parent_->AllowSiteData(false, false);
-    } else {
-      DCHECK(content_setting == CONTENT_SETTING_BLOCK);
-      parent_->BlockSiteData(false);
-    }
-    signaled_ = true;
-    GetWindow()->Close();
-    return;
-  }
-
   CookiePromptModalDialog::DialogType type = parent_->dialog_type();
   std::wstring display_host = UTF8ToWide(parent_->origin().host());
   views::Label* description_label = new views::Label(l10n_util::GetStringF(