chrome/browser/extensions/extension_incognito_apitest.cc - Issue 1225093003: mac: Flush the autorelease pool after making a browser window in browser tests.

Unified Diff: chrome/browser/extensions/extension_incognito_apitest.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: Add missing include. 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/browser/extensions/extension_icon_source_apitest.cc ('k') | chrome/browser/extensions/extension_messages_apitest.cc » ('j') | chrome/test/base/in_process_browser_test.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_incognito_apitest.cc

diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc

index f65a8ea8bd4677c8aa42b7497b8082dd79b2c557..4eec5bf348254dc2becb61f0a1949b393f294c10 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,9 +109,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Incognito) {

ResultCatcher catcher;

// 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"));

James Hawkins 2015/07/13 18:22:23 Indentation is off.

erikchen 2015/07/13 19:39:21 That was the output from clang format. I've manual

ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_

.AppendASCII("incognito").AppendASCII("apis")));

@@ -138,9 +137,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 +168,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 +193,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"));