MacViews: Harmony for TabDialogs' dialogs (starting with Collected Cookies)

chrome/browser/ui/collected_cookies_browsertest.cc

Index: chrome/browser/ui/collected_cookies_browsertest.cc
diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/ui/collected_cookies_browsertest.cc
similarity index 42%
rename from chrome/browser/collected_cookies_browsertest.cc
rename to chrome/browser/ui/collected_cookies_browsertest.cc
index d190cf9fa30264c9843173490b34c17c0ecae0a8..03162654235eadaf48e4507b7f4b0f9f95682dac 100644
--- a/chrome/browser/collected_cookies_browsertest.cc
+++ b/chrome/browser/ui/collected_cookies_browsertest.cc
@@ -4,54 +4,80 @@
 
 #include <string>
 
+#include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "ui/base/ui_base_switches.h"
 
-typedef InProcessBrowserTest CollectedCookiesTest;
+class CollectedCookiesTest : public DialogBrowserTest {
+ public:
+  CollectedCookiesTest() {}
 
-// If this crashes on Windows, use http://crbug.com/79331
-IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) {
-  ASSERT_TRUE(embedded_test_server()->Start());
+  // TestDialogInterface:
+  void ShowDialog(const std::string& name) override {
+    ASSERT_TRUE(embedded_test_server()->Start());
 
-  // Disable cookies.
-  CookieSettingsFactory::GetForProfile(browser()->profile())
-      ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
+    // Disable cookies.
+    CookieSettingsFactory::GetForProfile(browser()->profile())
+        ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
 
-  // Load a page with cookies.
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL("/cookie1.html"));
+    // Load a page with cookies.
+    ui_test_utils::NavigateToURL(
+        browser(), embedded_test_server()->GetURL("/cookie1.html"));
 
-  // Click on the info link twice.
-  content::WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  TabDialogs::FromWebContents(web_contents)->ShowCollectedCookies();
-  TabDialogs::FromWebContents(web_contents)->ShowCollectedCookies();
-}
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    TabDialogs::FromWebContents(web_contents)->ShowCollectedCookies();
+  }
 
-// If this crashes on Windows, use http://crbug.com/79331
-IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) {
-  ASSERT_TRUE(embedded_test_server()->Start());
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CollectedCookiesTest);
+};
 
-  // Disable cookies.
-  CookieSettingsFactory::GetForProfile(browser()->profile())
-      ->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
+// Runs with --secondary-ui-md. Users of this can switch to CollectedCookiesTest
+// when that is the default.
+class CollectedCookiesTestMd : public CollectedCookiesTest {
+ public:
+  CollectedCookiesTestMd() {}
 
-  // Load a page with cookies.
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL("/cookie1.html"));
+  // content::BrowserTestBase:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    command_line->AppendSwitch(switches::kExtendMdToSecondaryUi);
+  }
 
-  // Click on the info link.
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CollectedCookiesTestMd);
+};
+
+// Test that calls ShowDialog("default"). Interactive when run via
+// browser_tests --gtest_filter=BrowserDialogTest.Invoke --interactive
+// --dialog=CollectedCookiesTestMd.InvokeDialog_default
+IN_PROC_BROWSER_TEST_F(CollectedCookiesTestMd, InvokeDialog_default) {
+  RunDialog();
+}
+
+// If this crashes on Windows, use http://crbug.com/79331
+IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) {
+  ShowDialog(std::string());
+
+  // Click on the info link a second time.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   TabDialogs::FromWebContents(web_contents)->ShowCollectedCookies();
+}
+
+// If this crashes on Windows, use http://crbug.com/79331
+IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) {
+  ShowDialog(std::string());
 
   // Navigate to another page.
   ui_test_utils::NavigateToURL(