Update infobar references to balloon and delete obsoleted tests for multiple infobars.

chrome/browser/extensions/extension_crash_recovery_browsertest.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 "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 207 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
       ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                 FilePath(FILE_PATH_LITERAL("title1.html"))));
   ASSERT_EQ(1U, CountBalloons());
 
   ReloadExtension(first_extension_id_);
 
   SCOPED_TRACE("after reloading");
   CheckExtensionConsistency(size_before);
 
-  // The infobar should automatically hide after the extension is successfully
+  // The balloon should automatically hide after the extension is successfully
   // reloaded.
   ASSERT_EQ(0U, CountBalloons());
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
-                       ReloadIndependentlyTwoInfoBars) {
-  const size_t size_before = GetExtensionService()->extensions()->size();
-  LoadTestExtension();
-
-  // Open a new window so that there will be an info bar in each.
-  Browser* browser2 = CreateBrowser(browser()->profile());
-
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
-
-  TabContents* current_tab = browser()->GetSelectedTabContents();
-  ASSERT_TRUE(current_tab);
-  ASSERT_EQ(1U, CountBalloons());
-
-  TabContents* current_tab2 = browser2->GetSelectedTabContents();
-  ASSERT_TRUE(current_tab2);
-  ASSERT_EQ(1U, CountBalloons());
-
-  ReloadExtension(first_extension_id_);
-
-  SCOPED_TRACE("after reloading");
-  CheckExtensionConsistency(size_before);
-
-  // Both infobars should automatically hide after the extension is successfully
-  // reloaded.
-  ASSERT_EQ(0U, CountBalloons());
-  ASSERT_EQ(0U, CountBalloons());
-}
-
-IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
-                       ReloadIndependentlyTwoInfoBarsSameBrowser) {
-  const size_t size_before = GetExtensionService()->extensions()->size();
-  LoadTestExtension();
-
-  // Open a new window so that there will be an info bar in each.
-  Browser* browser2 = CreateBrowser(browser()->profile());
-
-  CrashExtension(size_before);
-  ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
-
-  TabContents* current_tab = browser()->GetSelectedTabContents();
-  ASSERT_TRUE(current_tab);
-  ASSERT_EQ(1U, CountBalloons());
-
-  TabContents* current_tab2 = browser2->GetSelectedTabContents();
-  ASSERT_TRUE(current_tab2);
-  ASSERT_EQ(1U, CountBalloons());
-
-  // Move second window into first browser so there will be multiple tabs
-  // with the info bar for the same extension in one browser.
-  TabContentsWrapper* contents =
-      browser2->tabstrip_model()->DetachTabContentsAt(0);
-  browser()->tabstrip_model()->AppendTabContents(contents, true);
-  current_tab2 = browser()->GetSelectedTabContents();
-  ASSERT_EQ(1U, CountBalloons());
-  ASSERT_NE(current_tab2, current_tab);
-
-  ReloadExtension(first_extension_id_);
-
-  SCOPED_TRACE("after reloading");
-  CheckExtensionConsistency(size_before);
-
-  // Both infobars should automatically hide after the extension is successfully
-  // reloaded.
-  ASSERT_EQ(0U, CountBalloons());
-  browser()->SelectPreviousTab();
-  ASSERT_EQ(current_tab, browser()->GetSelectedTabContents());
-  ASSERT_EQ(0U, CountBalloons());
-}
-
 // Make sure that when we don't do anything about the crashed extension
 // and close the browser, it doesn't crash. The browser is closed implicitly
 // at the end of each browser test.
 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ShutdownWhileCrashed) {
   const size_t size_before = GetExtensionService()->extensions()->size();
   LoadTestExtension();
   CrashExtension(size_before);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 }
 
@@ skipping 116 matching lines @@
   LoadSecondExtension();
   CrashExtension(size_before);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   CrashExtension(size_before);
   ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
 
   {
     SCOPED_TRACE("first: reload");
     TabContents* current_tab = browser()->GetSelectedTabContents();
     ASSERT_TRUE(current_tab);
-    // At the beginning we should have one infobar displayed for each extension.
+    // At the beginning we should have one balloon displayed for each extension.
     ASSERT_EQ(2U, CountBalloons());
     ReloadExtension(first_extension_id_);
-    // One of the infobars should hide after the extension is reloaded.
+    // One of the balloons should hide after the extension is reloaded.
     ASSERT_EQ(1U, CountBalloons());
     CheckExtensionConsistency(size_before);
   }
 
   {
     SCOPED_TRACE("second: balloon");
     AcceptNotification(0);
     CheckExtensionConsistency(size_before);
     CheckExtensionConsistency(size_before + 1);
   }
@@ skipping 29 matching lines @@
   LoadSecondExtension();
   CrashExtension(size_before);
   ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
   ASSERT_EQ(crash_size_before + 1,
             GetExtensionService()->terminated_extensions()->size());
 
   GetExtensionService()->UnloadAllExtensions();
   ASSERT_EQ(crash_size_before,
             GetExtensionService()->terminated_extensions()->size());
 }