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

chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc

Index: chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
index f2122036ee38c9c6084caabfcc7d2e9b851a758a..94f853ece16c36eb80f7ece68ca41f4096e64a16 100644
--- a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc
@@ -92,12 +92,17 @@ void ExtensionMessageBubbleViewBrowserTest::SetUpCommandLine(
 
 void ExtensionMessageBubbleViewBrowserTest::ShowDialog(
     const std::string& name) {
-  // TODO(tapted): Add cases for all bubble types.
-  EXPECT_EQ("devmode_warning", name);
-
   // When invoked this way, the dialog test harness must close the bubble.
   base::AutoReset<bool> guard(&block_close_, true);
-  TestBubbleAnchoredToExtensionAction();
+
+  if (name == "devmode_warning") {
+    TestBubbleAnchoredToExtensionAction();
+  } else if (name == "ntp_override") {
+    TestControlledNewTabPageBubbleShown(false);
+  } else {
+    // TODO(tapted): Add cases for all bubble types.
+    ADD_FAILURE() << "Unknown dialog: " << name;
+  }
 }
 
 void ExtensionMessageBubbleViewBrowserTest::CheckBubbleNative(
@@ -193,7 +198,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledNewTabPageMessageBubble) {
-  TestControlledNewTabPageBubbleShown();
+  TestControlledNewTabPageBubbleShown(false);
+}
+
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
+                       TestControlledNewTabPageMessageBubbleLearnMore) {
+  TestControlledNewTabPageBubbleShown(true);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
@@ -226,6 +236,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
   TestControlledStartupNotShownOnRestart();
 }
 
+// BrowserDialogTest for the warning bubble that appears when opening a new tab
+// and an extension is controlling it. Only shown on Windows.
+IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
+                       InvokeDialog_ntp_override) {
+  RunDialog();
+}
+
 #endif  // defined(OS_WIN)
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,