| 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..c9a33c21f6a3abc65f1b8864e1ecd3a557f461c3 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"));
|
|
|
|
|