Mac: Convert all the TabDialogs to Harmony

chrome/browser/collected_cookies_browsertest.cc

Index: chrome/browser/collected_cookies_browsertest.cc
diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc
index d190cf9fa30264c9843173490b34c17c0ecae0a8..fbd4d6f723fe3f5a0721efcb62612c0fe78e36c5 100644
--- a/chrome/browser/collected_cookies_browsertest.cc
+++ b/chrome/browser/collected_cookies_browsertest.cc
@@ -9,49 +9,53 @@
 #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"
 
-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(int index) 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);
+TEST_BROWSER_DIALOG(CollectedCookiesTest);
 
-  // Load a page with cookies.
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL("/cookie1.html"));
+// If this crashes on Windows, use http://crbug.com/79331
+IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) {
+  ShowDialog(0);
 
-  // Click on the info link.
+  // 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(0);
 
   // Navigate to another page.
   ui_test_utils::NavigateToURL(