[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

 // 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 "base/auto_reset.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 74 matching lines @@
     base::CommandLine* command_line) {
   ExtensionMessageBubbleBrowserTest::SetUpCommandLine(command_line);
   // MD is required on Mac to get a Views bubble. On other platforms, it should
   // not affect the behavior of the bubble (just the appearance), so enable for
   // all platforms.
   command_line->AppendSwitch(switches::kExtendMdToSecondaryUi);
 }
 
 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(
     Browser* browser,
     AnchorPosition anchor) {
   gfx::Rect reference_bounds =
       GetAnchorReferenceBoundsForBrowser(browser, anchor);
   CheckBubbleAgainstReferenceBounds(GetViewsBubbleForBrowser(browser),
                                     reference_bounds);
 }
@@ skipping 75 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestDevModeBubbleIsntShownTwice) {
   TestDevModeBubbleIsntShownTwice();
 }
 
 // Tests for the extension bubble and settings overrides. These bubbles are
 // currently only shown on Windows.
 #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,
                        TestControlledHomeMessageBubble) {
   TestControlledHomeBubbleShown();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledSearchMessageBubble) {
   TestControlledSearchBubbleShown();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        PRE_TestControlledStartupMessageBubble) {
   PreTestControlledStartupBubbleShown();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledStartupMessageBubble) {
   TestControlledStartupBubbleShown();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        PRE_TestControlledStartupNotShownOnRestart) {
   PreTestControlledStartupNotShownOnRestart();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestControlledStartupNotShownOnRestart) {
   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,
                        TestBubbleWithMultipleWindows) {
   TestBubbleWithMultipleWindows();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestClickingLearnMoreButton) {
   TestClickingLearnMoreButton();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestClickingActionButton) {
   TestClickingActionButton();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        TestClickingDismissButton) {
   TestClickingDismissButton();
 }
 
 // BrowserDialogTest for the warning bubble that appears at startup when there
 // are extensions installed in developer mode. Can be invoked interactively with
 // --gtest_filter=BrowserDialogTest.Invoke.
 IN_PROC_BROWSER_TEST_F(ExtensionMessageBubbleViewBrowserTest,
                        InvokeDialog_devmode_warning) {
   RunDialog();
 }