[merge-m59] Cater for the "double close" when clicking "Learn More" on auto-dismiss extension bubbl…

chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc

 // Copyright 2015 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/ui/extensions/extension_message_bubble_browsertest.h"
 
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 198 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // The bubble was already shown, so it shouldn't be shown again.
   Browser* third_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(third_browser);
   third_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(third_browser, false, false);
 }
 
-void ExtensionMessageBubbleBrowserTest::TestControlledNewTabPageBubbleShown() {
+void ExtensionMessageBubbleBrowserTest::TestControlledNewTabPageBubbleShown(
+    bool click_learn_more) {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
                                           .AppendASCII("override")
                                           .AppendASCII("newtab")));
   CheckBubbleIsNotPresent(browser(), false, false);
+  EXPECT_EQ(1, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
+  EXPECT_EQ(2, browser()->tab_strip_model()->count());
   base::RunLoop().RunUntilIdle();
   CheckBubble(browser(), ANCHOR_BROWSER_ACTION, false);
-  CloseBubble(browser());
+  if (click_learn_more) {
+    ClickLearnMoreButton(browser());
+    EXPECT_EQ(3, browser()->tab_strip_model()->count());
+  } else {
+    CloseBubble(browser());
+    EXPECT_EQ(2, browser()->tab_strip_model()->count());
+  }
 }
 
 void ExtensionMessageBubbleBrowserTest::TestControlledHomeBubbleShown() {
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kShowHomeButton, true);
 
   const char kHomePage[] = "'homepage': 'https://www.google.com'\n";
   AddSettingsOverrideExtension(kHomePage);
 
   CheckBubbleIsNotPresent(browser(), false, false);
 
@@ skipping 131 matching lines @@
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   ClickDismissButton(second_browser);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(browser(), false, false);
   // Clicking dismiss should have no affect, so the extension should still be
   // active.
   EXPECT_TRUE(registry->enabled_extensions().GetByID(id));
 }