Fix a couple of crashes related to app-crashed balloon.

chrome/browser/background_contents_service.cc

 // Copyright (c) 2011 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/background_contents_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 47 matching lines @@
   }
 
   void Display() {}
 
   void Error() {}
 
   void Close(bool by_user) {}
 
   void Click() {
     if (is_hosted_app_) {
       BackgroundContentsServiceFactory::GetForProfile(profile_)->

[Andrew T Wilson (Slow), 2011/05/15 16:58:08]

So, it seems like there's still a race condition that could lead to a crash
(user reloads page and clicks notification simultaneously). To be safe we should
check to make sure there's no BG contents here before calling
LoadBackgroundContentsForExtension() (or put that check in
LoadBackgroundContentsForExtension()).

[sadrul, 2011/05/15 17:56:54]

Done (added the check in here).

           LoadBackgroundContentsForExtension(profile_, extension_id_);
     } else {
       profile_->GetExtensionService()->ReloadExtension(extension_id_);
     }
 
     // Closing the balloon here should be OK, but it causes a crash on Mac
     // http://crbug.com/78167
     ScheduleCloseBalloon(extension_id_);
   }
 
@@ skipping 143 matching lines @@
       Profile* profile = Source<Profile>(source).ptr();
       const string16& appid = GetParentApplicationId(bgcontents);
       ExtensionService* extension_service = profile->GetExtensionService();
       // extension_service can be NULL when running tests.
       if (extension_service) {
         const Extension* extension =
             extension_service->GetExtensionById(UTF16ToUTF8(appid), false);
         if (extension && extension->background_url().is_valid())
           break;
       }
-      RegisterBackgroundContents(Details<BackgroundContents>(details).ptr());
+      RegisterBackgroundContents(bgcontents);
       break;
     }
     case NotificationType::EXTENSION_LOADED: {
       const Extension* extension = Details<const Extension>(details).ptr();
       Profile* profile = Source<Profile>(source).ptr();
       if (extension->is_hosted_app() &&
           extension->background_url().is_valid()) {
         // If there is a background page specified in the manifest for a hosted
         // app, then blow away registered urls in the pref.
         ShutdownAssociatedBackgroundContents(ASCIIToUTF16(extension->id()));
@@ skipping 137 matching lines @@
 }
 
 void BackgroundContentsService::LoadBackgroundContentsFromDictionary(
     Profile* profile,
     const std::string& extension_id,
     const DictionaryValue* contents) {
   ExtensionService* extensions_service = profile->GetExtensionService();
   DCHECK(extensions_service);
 
   DictionaryValue* dict;
-  contents->GetDictionaryWithoutPathExpansion(extension_id, &dict);
-  if (dict == NULL)
+  if (!contents->GetDictionaryWithoutPathExpansion(extension_id, &dict) ||
+      dict == NULL)
     return;
+
   string16 frame_name;
   std::string url;
   dict->GetString(kUrlKey, &url);
   dict->GetString(kFrameNameKey, &frame_name);
   LoadBackgroundContents(profile,
                          GURL(url),
                          frame_name,
                          UTF8ToUTF16(extension_id));
 }
 
@@ skipping 108 matching lines @@
   }
 }
 
 void BackgroundContentsService::BackgroundContentsOpened(
     BackgroundContentsOpenedDetails* details) {
   // Add the passed object to our list. Should not already be tracked.
   DCHECK(!IsTracked(details->contents));
   DCHECK(!details->application_id.empty());
   contents_map_[details->application_id].contents = details->contents;
   contents_map_[details->application_id].frame_name = details->frame_name;
+
+  ScheduleCloseBalloon(UTF16ToASCII(details->application_id));
 }
 
 // Used by test code and debug checks to verify whether a given
 // BackgroundContents is being tracked by this instance.
 bool BackgroundContentsService::IsTracked(
     BackgroundContents* background_contents) const {
   return !GetParentApplicationId(background_contents).empty();
 }
 
 void BackgroundContentsService::BackgroundContentsShutdown(
@@ skipping 30 matching lines @@
     TabContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(
       new_contents->profile());
   if (!browser)
     return;
   browser->AddTabContents(new_contents, disposition, initial_pos, user_gesture);
 }