[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

Index: chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
index 6e76c1aab398a9aa7e233674a03dfb6093bdc813..99d3ae16d5e4461cb8a854375eea27c0f8da0351 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
@@ -216,15 +216,24 @@ void ExtensionMessageBubbleBrowserTest::TestDevModeBubbleIsntShownTwice() {
   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() {