Merge 13113 - NULL check web_contents_ to prevent a crash....

chrome/browser/jsmessage_box_handler_win.cc

Index: chrome/browser/jsmessage_box_handler_win.cc
===================================================================
--- chrome/browser/jsmessage_box_handler_win.cc	(revision 13559)
+++ chrome/browser/jsmessage_box_handler_win.cc	(working copy)
@@ -84,7 +84,7 @@
 }
 
 std::wstring JavascriptMessageBoxHandler::GetWindowTitle() const {
-  if (!frame_url_.has_host())
+  if (!frame_url_.has_host() || !web_contents_)
     return l10n_util::GetString(IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
 
   // We really only want the scheme, hostname, and port.
@@ -189,10 +189,11 @@
 void JavascriptMessageBoxHandler::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  bool web_contents_gone = false;
   if (!web_contents_)
     return;
 
+  bool web_contents_gone = false;
+
   if (type == NotificationType::NAV_ENTRY_COMMITTED &&
       Source<NavigationController>(source).ptr() == web_contents_->controller())
     web_contents_gone = true;