Fix couple of issues in ExtensionCrashRecoveryTest. In particular the

chrome/browser/extensions/extension_crash_recovery_browsertest.cc

 // Copyright (c) 2012 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 "base/process_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 28 matching lines @@
  protected:
   ExtensionService* GetExtensionService() {
     return browser()->profile()->GetExtensionService();
   }
 
   ExtensionProcessManager* GetExtensionProcessManager() {
     return extensions::ExtensionSystem::Get(browser()->profile())->
         process_manager();
   }
 
-  Balloon* GetNotificationDelegate(size_t index) {
-    NotificationUIManager* manager =
-        g_browser_process->notification_ui_manager();
-    BalloonCollection::Balloons balloons =
-        manager->balloon_collection()->GetActiveBalloons();
-    return balloons.at(index);
-  }
-
   void AcceptNotification(size_t index) {
     Balloon* balloon = GetNotificationDelegate(index);
     ASSERT_TRUE(balloon);
     balloon->OnClick();
     WaitForExtensionLoad();
   }
 
   void CancelNotification(size_t index) {
     Balloon* balloon = GetNotificationDelegate(index);
+    ASSERT_TRUE(balloon);
     NotificationUIManager* manager =
         g_browser_process->notification_ui_manager();
     ASSERT_TRUE(manager->CancelById(balloon->notification().notification_id()));
   }
 
   size_t CountBalloons() {
     NotificationUIManager* manager =
         g_browser_process->notification_ui_manager();
     BalloonCollection::Balloons balloons =
         manager->balloon_collection()->GetActiveBalloons();
@@ skipping 47 matching lines @@
   void LoadSecondExtension() {
     const Extension* extension = LoadExtension(
         test_data_dir_.AppendASCII("install").AppendASCII("install"));
     ASSERT_TRUE(extension);
     second_extension_id_ = extension->id();
     CheckExtensionConsistency(second_extension_id_);
   }
 
   std::string first_extension_id_;
   std::string second_extension_id_;
+
+ private:
+  Balloon* GetNotificationDelegate(size_t index) {
+    NotificationUIManager* manager =
+        g_browser_process->notification_ui_manager();
+    BalloonCollection::Balloons balloons =
+        manager->balloon_collection()->GetActiveBalloons();
+    return index < balloons.size() ? balloons.at(index) : NULL;
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, Basic) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   const size_t crash_size_before =
       GetExtensionService()->terminated_extensions()->size();
   LoadTestExtension();
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
-  AcceptNotification(0);
+  ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
 
   SCOPED_TRACE("after clicking the balloon");
   CheckExtensionConsistency(first_extension_id_);
   ASSERT_EQ(crash_size_before,
             GetExtensionService()->terminated_extensions()->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CloseAndReload) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   const size_t crash_size_before =
       GetExtensionService()->terminated_extensions()->size();
   LoadTestExtension();
   CrashExtension(first_extension_id_);
 
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
 
-  CancelNotification(0);
+  ASSERT_NO_FATAL_FAILURE(CancelNotification(0));
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
   CheckExtensionConsistency(first_extension_id_);
   ASSERT_EQ(crash_size_before,
             GetExtensionService()->terminated_extensions()->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) {
   const size_t size_before = GetExtensionService()->extensions()->size();
@@ skipping 86 matching lines @@
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
-  AcceptNotification(0);
+  ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
 
   SCOPED_TRACE("after clicking the balloon");
   CheckExtensionConsistency(first_extension_id_);
   CheckExtensionConsistency(second_extension_id_);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(second_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
-  AcceptNotification(0);
+  ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
 
   SCOPED_TRACE("after clicking the balloon");
   CheckExtensionConsistency(first_extension_id_);
   CheckExtensionConsistency(second_extension_id_);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsCrashBothAtOnce) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   const size_t crash_size_before =
       GetExtensionService()->terminated_extensions()->size();
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
   CrashExtension(second_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 2,
             GetExtensionService()->terminated_extensions()->size());
 
   {
     SCOPED_TRACE("first balloon");
-    AcceptNotification(0);
+    ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
     CheckExtensionConsistency(first_extension_id_);
   }
 
   {
     SCOPED_TRACE("second balloon");
-    AcceptNotification(0);
+    ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
     CheckExtensionConsistency(first_extension_id_);
     CheckExtensionConsistency(second_extension_id_);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
   LoadSecondExtension();
   CrashExtension(second_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   {
     SCOPED_TRACE("first balloon");
-    AcceptNotification(0);
+    ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
     CheckExtensionConsistency(first_extension_id_);
   }
 
   {
     SCOPED_TRACE("second balloon");
-    AcceptNotification(0);
+    ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
     CheckExtensionConsistency(first_extension_id_);
     CheckExtensionConsistency(second_extension_id_);
   }
 }
 
 // http://crbug.com/84719
 #if defined(OS_LINUX)
 #define MAYBE_TwoExtensionsShutdownWhileCrashed \
     DISABLED_TwoExtensionsShutdownWhileCrashed
 #else
@@ skipping 21 matching lines @@
   LoadTestExtension();
   LoadSecondExtension();
   CrashExtension(first_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CrashExtension(second_extension_id_);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   // Accept notification 1 before canceling notification 0.
   // Otherwise, on Linux and Windows, there is a race here, in which
   // canceled notifications do not immediately go away.
-  AcceptNotification(1);
-  CancelNotification(0);
+  ASSERT_NO_FATAL_FAILURE(AcceptNotification(1));
+  ASSERT_NO_FATAL_FAILURE(CancelNotification(0));
 
   SCOPED_TRACE("balloons done");
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CheckExtensionConsistency(second_extension_id_);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
                        TwoExtensionsReloadIndependently) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
@@ skipping 10 matching lines @@
     // At the beginning we should have one balloon displayed for each extension.
     ASSERT_EQ(2U, CountBalloons());
     ReloadExtension(first_extension_id_);
     // One of the balloons should hide after the extension is reloaded.
     ASSERT_EQ(1U, CountBalloons());
     CheckExtensionConsistency(first_extension_id_);
   }
 
   {
     SCOPED_TRACE("second: balloon");
-    AcceptNotification(0);
+    ASSERT_NO_FATAL_FAILURE(AcceptNotification(0));
     CheckExtensionConsistency(first_extension_id_);
     CheckExtensionConsistency(second_extension_id_);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CrashAndUninstall) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   const size_t crash_size_before =
       GetExtensionService()->terminated_extensions()->size();
   LoadTestExtension();
@@ skipping 72 matching lines @@
     observer.Wait();
   }
   // Extension should now be loaded.
   SCOPED_TRACE("after reloading the tab");
   CheckExtensionConsistency(first_extension_id_);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   ASSERT_EQ(0U, CountBalloons());
 }
 
 #endif