mac: Flush the autorelease pool after making a browser window in browser tests.

Failure to do so causes some Chrome NSObjects to not be destroyed until after
the rest of the test infrastructure has been torn down. This causes failures
when running browser tests on Yosemite.

This CL moves the method OpenURLOffTheRecord from the ui_test_utils namespace
into an instance method on InProcessBrowserTest. This allows the method to flush
the autoreleasepool on Macs.

This CL adds the method OpenDevToolsWindow to InProcessBrowserTest. This is a
wrapper around DevToolsWindow::OpenDevToolsWindow that flushes the
autoreleasepool on Macs.

BUG=445495

Review URL: https://codereview.chromium.org/1225093003

Cr-Commit-Position: refs/heads/master@{#338593}

28 files changed, 178 insertions, 80 deletions

diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 47eac85..c19a0cf 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -850,10 +850,7 @@ void PlatformAppDevToolsBrowserTest::RunTestWithDevTools(
   content::WebContents* web_contents = window->web_contents();
   ASSERT_TRUE(web_contents);
 
-  // Ensure no DevTools open for the AppWindow, then open one.
-  ASSERT_FALSE(DevToolsAgentHost::HasFor(web_contents));
-  DevToolsWindow::OpenDevToolsWindow(web_contents);
-  ASSERT_TRUE(DevToolsAgentHost::HasFor(web_contents));
+  OpenDevToolsWindow(web_contents);
 
   if (test_flags & RELAUNCH) {
     // Close the AppWindow, and ensure it is gone.
diff --git a/chrome/browser/extensions/api/cookies/cookies_apitest.cc b/chrome/browser/extensions/api/cookies/cookies_apitest.cc
index 1144669..84d6f80 100644
--- a/chrome/browser/extensions/api/cookies/cookies_apitest.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_apitest.cc
@@ -27,8 +27,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CookiesEventsSpanning) {
   // incognito cookie store. Otherwise, the chrome.cookies.set operation is just
   // ignored and we won't be notified about a newly set cookie for which we want
   // to test whether the storeId is set correctly.
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
-                                     GURL("chrome://newtab/"));
+  OpenURLOffTheRecord(browser()->profile(), GURL("chrome://newtab/"));
   ASSERT_TRUE(RunExtensionTestIncognito("cookies/events_spanning")) << message_;
 }
 
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index cd53e30..32eeae5 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -538,7 +538,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoSplit) {
                                         browser()->host_desktop_type()));
   base::RunLoop().RunUntilIdle();  // Wait for profile initialization.
   // Navigate just to have a tab in this window, otherwise wonky things happen.
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
+  OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
   ASSERT_EQ(1,
             BrowserActionTestUtil(incognito_browser).NumberOfBrowserActions());
 
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 9d8c45c..4fdf96e 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -164,7 +164,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest,
   listener.set_extension_id(extension->id());
 
   Browser* incognito_browser =
-      ui_test_utils::OpenURLOffTheRecord(profile(), GURL("chrome://newtab/"));
+      OpenURLOffTheRecord(profile(), GURL("chrome://newtab/"));
   listener.WaitUntilSatisfied();
   EXPECT_EQ(std::string("opened"), listener.message());
   EXPECT_TRUE(BrowserActionTestUtil(incognito_browser).HasPopup());
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index 6b971db..2afdfb1 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -225,7 +225,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, OnChangeSplit) {
       profile_->GetOffTheRecordProfile());
 
   // Open an incognito window.
-  ui_test_utils::OpenURLOffTheRecord(profile_, GURL("chrome://newtab/"));
+  OpenURLOffTheRecord(profile_, GURL("chrome://newtab/"));
 
   // changeDefault listeners.
   ExtensionTestMessageListener listener1("changeDefault regular ready", true);
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 007f2b0..169f8da 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -590,8 +590,7 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, TargetBlankIncognito) {
   GURL url = embedded_test_server()->GetURL(
       "/extensions/api_test/webnavigation/targetBlank/a.html");
 
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), url);
+  Browser* otr_browser = OpenURLOffTheRecord(browser()->profile(), url);
   WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents();
 
   // There's a link with target=_blank on a.html. Click on it to open it in a
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 3201f0b..c9bdf6e 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -216,8 +216,8 @@ void ExtensionWebRequestApiTest::RunPermissionTest(
   EXPECT_EQ(expected_content_regular_window, body);
 
   // Test that navigation in OTR window is properly redirected.
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GURL("about:blank"));
+  Browser* otr_browser =
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   if (wait_for_extension_loaded_in_incognito)
     EXPECT_TRUE(listener_incognito.WaitUntilSatisfied());
@@ -307,7 +307,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, IncognitoSplitModeReload) {
       test_data_dir_.AppendASCII("webrequest_reload"),
       kFlagEnableIncognito);
   ASSERT_TRUE(extension);
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
+  OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
   EXPECT_TRUE(listener_incognito.WaitUntilSatisfied());
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 46544fb..ae3b7ce 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -317,7 +317,7 @@ bool ExtensionApiTest::RunExtensionTestImpl(const std::string& extension_name,
     }
 
     if (use_incognito)
-      ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url);
+      OpenURLOffTheRecord(browser()->profile(), url);
     else
       ui_test_utils::NavigateToURL(browser(), url);
   } else if (launch_platform_app) {
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index bb5eeb3..95fbfab 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc
@@ -534,8 +534,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, MAYBE_IncognitoSplit) {
                                                  false);
 
   // Open an incognito window.
-  Browser* browser_incognito = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GURL("about:blank"));
+  Browser* browser_incognito =
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   ASSERT_TRUE(LoadContextMenuExtensionIncognito("incognito"));
 
diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc
index 9b64263..a79ccc5 100644
--- a/chrome/browser/extensions/extension_icon_source_apitest.cc
+++ b/chrome/browser/extensions/extension_icon_source_apitest.cc
@@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoadedIncognito) {
 
   // Test that the icons are loaded and that the chrome://extension-icon
   // parameters work correctly.
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* otr_browser = OpenURLOffTheRecord(
       browser()->profile(),
       GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
@@ -103,7 +103,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoadedIncognito) {
 
   // Verify that the an extension can't load chrome://extension-icon icons
   // without the management permission.
-  ui_test_utils::OpenURLOffTheRecord(
+  OpenURLOffTheRecord(
       browser()->profile(),
       GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc
index f65a8ea..c9a33c2 100644
--- a/chrome/browser/extensions/extension_incognito_apitest.cc
+++ b/chrome/browser/extensions/extension_incognito_apitest.cc
@@ -30,7 +30,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) {
       .AppendASCII("content_scripts")));
 
   // Open incognito window and navigate to test page.
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* otr_browser = OpenURLOffTheRecord(
       browser()->profile(),
       embedded_test_server()->GetURL("/extensions/test_file.html"));
 
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_IncognitoYesScript) {
       .AppendASCII("content_scripts").AppendASCII("isolated_world1")));
 
   // Open incognito window and navigate to test page.
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* otr_browser = OpenURLOffTheRecord(
       browser()->profile(),
       embedded_test_server()->GetURL("/extensions/test_file.html"));
 
@@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) {
   ResultCatcher catcher;
 
   // Open incognito window and navigate to test page.
-  ui_test_utils::OpenURLOffTheRecord(
+  OpenURLOffTheRecord(
       browser()->profile(),
       embedded_test_server()->GetURL("/extensions/test_file.html"));
 
@@ -138,9 +138,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoSplitMode) {
   ExtensionTestMessageListener listener_incognito("waiting_incognito", true);
 
   // Open incognito window and navigate to test page.
-  ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(),
-      embedded_test_server()->GetURL("/extensions/test_file.html"));
+  OpenURLOffTheRecord(browser()->profile(), embedded_test_server()->GetURL(
+                                                "/extensions/test_file.html"));
 
   ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_
       .AppendASCII("incognito").AppendASCII("split")));
@@ -170,16 +169,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabled) {
   ExtensionTestMessageListener listener("createIncognitoTab", true);
 
   // Open incognito window and navigate to test page.
-  ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(),
-      embedded_test_server()->GetURL("/extensions/test_file.html"));
+  OpenURLOffTheRecord(browser()->profile(), embedded_test_server()->GetURL(
+                                                "/extensions/test_file.html"));
 
   ASSERT_TRUE(LoadExtension(test_data_dir_
       .AppendASCII("incognito").AppendASCII("apis_disabled")));
 
   EXPECT_TRUE(listener.WaitUntilSatisfied());
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
-                                     GURL("about:blank"));
+  OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
   listener.Reply("created");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -197,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoPopup) {
       .AppendASCII("incognito").AppendASCII("popup")));
 
   // Open incognito window and navigate to test page.
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* incognito_browser = OpenURLOffTheRecord(
       browser()->profile(),
       embedded_test_server()->GetURL("/extensions/test_file.html"));
 
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 4ee2395..f62159b 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -686,9 +686,8 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   scoped_refptr<const Extension> app = LoadChromiumConnectableApp();
   ASSERT_TRUE(app->is_platform_app());
 
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
-      profile()->GetOffTheRecordProfile(),
-      chromium_org_url());
+  Browser* incognito_browser = OpenURLOffTheRecord(
+      profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame = incognito_browser->
       tab_strip_model()->GetActiveWebContents()->GetMainFrame();
 
@@ -722,7 +721,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
 
   scoped_refptr<const Extension> extension = LoadChromiumConnectableExtension();
 
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* incognito_browser = OpenURLOffTheRecord(
       profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame =
       incognito_browser->tab_strip_model()
@@ -756,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   scoped_refptr<const Extension> app = LoadChromiumConnectableApp(false);
   ASSERT_TRUE(app->is_platform_app());
 
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* incognito_browser = OpenURLOffTheRecord(
       profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame =
       incognito_browser->tab_strip_model()
@@ -788,9 +787,8 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   scoped_refptr<const Extension> app = LoadChromiumConnectableApp();
   ASSERT_TRUE(app->is_platform_app());
 
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
-      profile()->GetOffTheRecordProfile(),
-      chromium_org_url());
+  Browser* incognito_browser = OpenURLOffTheRecord(
+      profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame = incognito_browser->
       tab_strip_model()->GetActiveWebContents()->GetMainFrame();
 
@@ -827,7 +825,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   ASSERT_TRUE(app->is_platform_app());
 
   // Open an incognito browser with two tabs displaying "chromium.org".
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* incognito_browser = OpenURLOffTheRecord(
       profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame1 =
       incognito_browser->tab_strip_model()
@@ -836,9 +834,8 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
   InfoBarService* infobar_service1 = InfoBarService::FromWebContents(
       incognito_browser->tab_strip_model()->GetActiveWebContents());
 
-  CHECK(ui_test_utils::OpenURLOffTheRecord(profile()->GetOffTheRecordProfile(),
-                                           chromium_org_url()) ==
-        incognito_browser);
+  CHECK(OpenURLOffTheRecord(profile()->GetOffTheRecordProfile(),
+                            chromium_org_url()) == incognito_browser);
   content::RenderFrameHost* incognito_frame2 =
       incognito_browser->tab_strip_model()
           ->GetActiveWebContents()
@@ -899,7 +896,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
 
   scoped_refptr<const Extension> extension = LoadChromiumConnectableExtension();
 
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
+  Browser* incognito_browser = OpenURLOffTheRecord(
       profile()->GetOffTheRecordProfile(), chromium_org_url());
   content::RenderFrameHost* incognito_frame =
       incognito_browser->tab_strip_model()
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
index d5eeed1..a865c970 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -78,8 +78,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewTabIncognito) {
 
   // Navigate an incognito tab to the new tab page.  We should get the actual
   // new tab page because we can't load chrome-extension URLs in incognito.
-  Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GURL("chrome://newtab/"));
+  Browser* otr_browser =
+      OpenURLOffTheRecord(browser()->profile(), GURL("chrome://newtab/"));
   WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(tab->GetController().GetVisibleEntry());
   EXPECT_FALSE(tab->GetController().GetVisibleEntry()->GetURL().
diff --git a/chrome/browser/extensions/extension_view_host_factory_browsertest.cc b/chrome/browser/extensions/extension_view_host_factory_browsertest.cc
index 68d47b0..83d468a 100644
--- a/chrome/browser/extensions/extension_view_host_factory_browsertest.cc
+++ b/chrome/browser/extensions/extension_view_host_factory_browsertest.cc
@@ -53,8 +53,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionViewHostFactoryTest, CreateExtensionHosts) {
 IN_PROC_BROWSER_TEST_F(ExtensionViewHostFactoryTest,
                        DISABLED_IncognitoExtensionHosts) {
   // Open an incognito browser.
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GURL("about:blank"));
+  Browser* incognito_browser =
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   // Load a non-split-mode extension, enabled in incognito.
   scoped_refptr<const Extension> regular_extension =
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 573e77d..bb80d1d 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -386,8 +386,8 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, MAYBE_WaitForNTP) {
 // See crbug.com/248437
 IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, DISABLED_IncognitoSplitMode) {
   // Open incognito window.
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GURL("about:blank"));
+  Browser* incognito_browser =
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   // Load the extension with incognito enabled.
   {
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index 2e8923b..4d7812e 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -291,8 +291,7 @@ bool GeolocationBrowserTest::Initialize(InitializationOptions options) {
 
   current_url_ = embedded_test_server()->GetURL(html_for_tests_);
   if (options == INITIALIZATION_OFFTHERECORD) {
-    current_browser_ = ui_test_utils::OpenURLOffTheRecord(
-        browser()->profile(), current_url_);
+    current_browser_ = OpenURLOffTheRecord(browser()->profile(), current_url_);
   } else {
     current_browser_ = browser();
     if (options == INITIALIZATION_NEWTAB)
diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc
index 71cca09..8d2408b 100644
--- a/chrome/browser/prefetch/prefetch_browsertest.cc
+++ b/chrome/browser/prefetch/prefetch_browsertest.cc
@@ -145,7 +145,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, IncognitoTest) {
 
   // Navigate just to have a tab in this window, otherwise there is no
   // WebContents for the incognito browser.
-  ui_test_utils::OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
+  OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
 
   EXPECT_TRUE(RunPrefetchExperiment(true, incognito_browser));
 }
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 7eb1e0f..c24cfee 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -3929,8 +3929,7 @@ class PrerenderIncognitoBrowserTest : public PrerenderBrowserTest {
  public:
   void SetUpOnMainThread() override {
     Profile* normal_profile = current_browser()->profile();
-    set_browser(ui_test_utils::OpenURLOffTheRecord(
-        normal_profile, GURL("about:blank")));
+    set_browser(OpenURLOffTheRecord(normal_profile, GURL("about:blank")));
     PrerenderBrowserTest::SetUpOnMainThread();
   }
 };
diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc
index 84973b8..e099154 100644
--- a/chrome/browser/profiles/host_zoom_map_browsertest.cc
+++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc
@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(HostZoomMapBrowserTest, ZoomEventsWorkForOffTheRecord) {
   std::string test_host(test_url.host());
   std::string test_scheme(test_url.scheme());
   Browser* incognito_browser =
-      ui_test_utils::OpenURLOffTheRecord(browser()->profile(), test_url);
+      OpenURLOffTheRecord(browser()->profile(), test_url);
 
   content::WebContents* web_contents =
       incognito_browser->tab_strip_model()->GetActiveWebContents();
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 8acaefc..362107a 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -537,8 +537,7 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
                        URLFetcherUsingMainContextDuringIncognitoTeardown) {
   Browser* incognito_browser =
-      ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
-                                         GURL("about:blank"));
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
   RunURLFetcherActiveDuringIncognitoTeardownTest(
       incognito_browser, incognito_browser->profile()->GetRequestContext());
 }
@@ -546,8 +545,8 @@ IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
                        URLFetcherUsingExtensionContextDuringIncognitoTeardown) {
   Browser* incognito_browser =
-      ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
-                                         GURL("about:blank"));
+      OpenURLOffTheRecord(browser()->profile(), GURL("about:blank"));
+
   RunURLFetcherActiveDuringIncognitoTeardownTest(
       incognito_browser,
       incognito_browser->profile()->GetRequestContextForExtensions());
diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc
index a8fcadc..975c3b7 100644
--- a/chrome/browser/ui/webui/webui_webview_browsertest.cc
+++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc
@@ -138,8 +138,8 @@ IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScriptWithCode) {
 // Right now we only have incognito WebUI on CrOS, but this should
 // theoretically work for all platforms.
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScriptIncognito) {
-  Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord(
-      browser()->profile(), GetWebViewEnabledWebUIURL());
+  Browser* incognito_browser =
+      OpenURLOffTheRecord(browser()->profile(), GetWebViewEnabledWebUIURL());
 
   SetWebUIInstance(
       incognito_browser->tab_strip_model()->GetActiveWebContents()->GetWebUI());
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index b40b698..1a668ef 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1476,7 +1476,7 @@
       'browser/media/router/media_source_unittest.cc',
       'browser/media/router/presentation_media_sinks_observer_unittest.cc',
       'browser/media/router/presentation_service_delegate_impl_unittest.cc',
-      'browser/media/router/presentation_session_state_observer_unittest.cc',      
+      'browser/media/router/presentation_session_state_observer_unittest.cc',
       'browser/ui/webui/media_router/media_cast_mode_unittest.cc',
       'browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc',
       'browser/ui/webui/media_router/media_router_test.cc',
@@ -1827,6 +1827,7 @@
         'test/base/history_index_restore_observer.h',
         'test/base/in_process_browser_test.cc',
         'test/base/in_process_browser_test.h',
+        'test/base/in_process_browser_test_mac.cc',
         'test/base/profile_mock.cc',
         'test/base/profile_mock.h',
         'test/base/scoped_browser_locale.cc',
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index a430bfa..27be332 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -41,6 +41,7 @@ source_set("test_support") {
     "base/history_index_restore_observer.h",
     "base/in_process_browser_test.cc",
     "base/in_process_browser_test.h",
+    "base/in_process_browser_test_mac.cc",
     "base/profile_mock.cc",
     "base/profile_mock.h",
     "base/scoped_browser_locale.cc",
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 96f521b..c5b8b28 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -20,11 +20,13 @@
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/net_error_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
@@ -45,6 +47,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/os_crypt/os_crypt.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/browser_test_utils.h"
@@ -440,6 +443,26 @@ bool InProcessBrowserTest::SetUpUserDataDirectory() {
   return true;
 }
 
+#if !defined(OS_MACOSX)
+void InProcessBrowserTest::OpenDevToolsWindow(
+    content::WebContents* web_contents) {
+  ASSERT_FALSE(content::DevToolsAgentHost::HasFor(web_contents));
+  DevToolsWindow::OpenDevToolsWindow(web_contents);
+  ASSERT_TRUE(content::DevToolsAgentHost::HasFor(web_contents));
+}
+
+Browser* InProcessBrowserTest::OpenURLOffTheRecord(Profile* profile,
+                                                   const GURL& url) {
+  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+  chrome::OpenURLOffTheRecord(profile, url, active_desktop);
+  Browser* browser = chrome::FindTabbedBrowser(
+      profile->GetOffTheRecordProfile(), false, active_desktop);
+  content::TestNavigationObserver observer(
+      browser->tab_strip_model()->GetActiveWebContents());
+  observer.Wait();
+  return browser;
+}
+
 // Creates a browser with a single tab (about:blank), waits for the tab to
 // finish loading and shows the browser.
 Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) {
@@ -476,6 +499,7 @@ Browser* InProcessBrowserTest::CreateBrowserForApp(
   AddBlankTabAndShow(browser);
   return browser;
 }
+#endif  // !defined(OS_MACOSX)
 
 void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) {
   content::WindowedNotificationObserver observer(
diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h
index 84049ec..9192ec2 100644
--- a/chrome/test/base/in_process_browser_test.h
+++ b/chrome/test/base/in_process_browser_test.h
@@ -143,6 +143,15 @@ class InProcessBrowserTest : public content::BrowserTestBase {
   // BrowserTestBase:
   void RunTestOnMainThreadLoop() override;
 
+  // Ensures that no devtools are open, and then opens the devtools.
+  void OpenDevToolsWindow(content::WebContents* web_contents);
+
+  // Opens |url| in an incognito browser window with the incognito profile of
+  // |profile|, blocking until the navigation finishes. This will create a new
+  // browser if a browser with the incognito profile does not exist. Returns the
+  // incognito window Browser.
+  Browser* OpenURLOffTheRecord(Profile* profile, const GURL& url);
+
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
   //
diff --git a/chrome/test/base/in_process_browser_test_mac.cc b/chrome/test/base/in_process_browser_test_mac.cc
new file mode 100644
index 0000000..aae36b0
--- /dev/null
+++ b/chrome/test/base/in_process_browser_test_mac.cc
@@ -0,0 +1,94 @@
+// 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 "chrome/test/base/in_process_browser_test.h"
+
+#include "base/mac/scoped_nsautorelease_pool.h"
+#include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/test/test_navigation_observer.h"
+
+void InProcessBrowserTest::OpenDevToolsWindow(
+    content::WebContents* web_contents) {
+  // Opening a Devtools Window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  ASSERT_FALSE(content::DevToolsAgentHost::HasFor(web_contents));
+  DevToolsWindow::OpenDevToolsWindow(web_contents);
+  ASSERT_TRUE(content::DevToolsAgentHost::HasFor(web_contents));
+}
+
+Browser* InProcessBrowserTest::OpenURLOffTheRecord(Profile* profile,
+                                                   const GURL& url) {
+  // Opening an incognito window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+  chrome::OpenURLOffTheRecord(profile, url, active_desktop);
+  Browser* browser = chrome::FindTabbedBrowser(
+      profile->GetOffTheRecordProfile(), false, active_desktop);
+  content::TestNavigationObserver observer(
+      browser->tab_strip_model()->GetActiveWebContents());
+  observer.Wait();
+  return browser;
+}
+
+// Creates a browser with a single tab (about:blank), waits for the tab to
+// finish loading and shows the browser.
+Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) {
+  // Making a browser window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  Browser* browser = new Browser(
+      Browser::CreateParams(profile, chrome::GetActiveDesktop()));
+  AddBlankTabAndShow(browser);
+  return browser;
+}
+
+Browser* InProcessBrowserTest::CreateIncognitoBrowser() {
+  // Making a browser window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  // Create a new browser with using the incognito profile.
+  Browser* incognito = new Browser(
+      Browser::CreateParams(browser()->profile()->GetOffTheRecordProfile(),
+                            chrome::GetActiveDesktop()));
+  AddBlankTabAndShow(incognito);
+  return incognito;
+}
+
+Browser* InProcessBrowserTest::CreateBrowserForPopup(Profile* profile) {
+  // Making a browser window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  Browser* browser =
+      new Browser(Browser::CreateParams(Browser::TYPE_POPUP, profile,
+                  chrome::GetActiveDesktop()));
+  AddBlankTabAndShow(browser);
+  return browser;
+}
+
+Browser* InProcessBrowserTest::CreateBrowserForApp(
+    const std::string& app_name,
+    Profile* profile) {
+  // Making a browser window can cause AppKit to throw objects into the
+  // autorelease pool. Flush the pool when this function returns.
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  Browser* browser = new Browser(
+      Browser::CreateParams::CreateForApp(
+          app_name, false /* trusted_source */, gfx::Rect(), profile,
+          chrome::GetActiveDesktop()));
+  AddBlankTabAndShow(browser);
+  return browser;
+}
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 552a118..4b4d488 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -146,17 +146,6 @@ bool GetCurrentTabTitle(const Browser* browser, base::string16* title) {
   return true;
 }
 
-Browser* OpenURLOffTheRecord(Profile* profile, const GURL& url) {
-  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
-  chrome::OpenURLOffTheRecord(profile, url, active_desktop);
-  Browser* browser = chrome::FindTabbedBrowser(
-      profile->GetOffTheRecordProfile(), false, active_desktop);
-  content::TestNavigationObserver observer(
-      browser->tab_strip_model()->GetActiveWebContents());
-  observer.Wait();
-  return browser;
-}
-
 void NavigateToURL(chrome::NavigateParams* params) {
   chrome::Navigate(params);
   content::WaitForLoadStop(params->target_contents);
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 632b861..e5a359a 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -74,12 +74,6 @@ enum BrowserTestWaitFlags {
 // Puts the current tab title in |title|. Returns true on success.
 bool GetCurrentTabTitle(const Browser* browser, base::string16* title);
 
-// Opens |url| in an incognito browser window with the incognito profile of
-// |profile|, blocking until the navigation finishes. This will create a new
-// browser if a browser with the incognito profile does not exist. Returns the
-// incognito window Browser.
-Browser* OpenURLOffTheRecord(Profile* profile, const GURL& url);
-
 // Performs the provided navigation process, blocking until the navigation
 // finishes. May change the params in some cases (i.e. if the navigation
 // opens a new browser window). Uses chrome::Navigate.