Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: chrome/test/base/in_process_browser_test_mac.cc

Issue 1225093003: mac: Flush the autorelease pool after making a browser window in browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@browser_test_base
Patch Set: Comments from jhawkins, round two. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/ui_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/in_process_browser_test_mac.cc
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 0000000000000000000000000000000000000000..aae36b00cfd93746ce4e34bc075184254332c905
--- /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;
+}
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698