| Index: chrome/browser/extensions/window_open_apitest.cc
|
| diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
|
| index 90bfdae50eddafe23386c2c7b77660470bd5ce3d..8b37713e74f81eb8386c81bc1b66c18f01ddbc7f 100644
|
| --- a/chrome/browser/extensions/window_open_apitest.cc
|
| +++ b/chrome/browser/extensions/window_open_apitest.cc
|
| @@ -21,10 +21,12 @@
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/result_codes.h"
|
| +#include "content/public/common/url_constants.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| #include "extensions/browser/extension_host.h"
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/browser/process_manager.h"
|
| +#include "extensions/common/constants.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/switches.h"
|
| #include "net/dns/mock_host_resolver.h"
|
| @@ -451,7 +453,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
|
| ASSERT_TRUE(LoadExtension(
|
| test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
|
|
|
| - GURL start_url(std::string("chrome-extension://") +
|
| + GURL start_url(std::string(extensions::kExtensionScheme) +
|
| + content::kStandardSchemeSeparator +
|
| last_loaded_extension_id() + "/test.html");
|
| ui_test_utils::NavigateToURL(browser(), start_url);
|
| WebContents* newtab = NULL;
|
| @@ -471,7 +474,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenInvalidExtension) {
|
| ASSERT_TRUE(LoadExtension(
|
| test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
|
|
|
| - GURL start_url(std::string("chrome-extension://") +
|
| + GURL start_url(std::string(extensions::kExtensionScheme) +
|
| + content::kStandardSchemeSeparator +
|
| last_loaded_extension_id() + "/test.html");
|
| ui_test_utils::NavigateToURL(browser(), start_url);
|
| ASSERT_NO_FATAL_FAILURE(
|
| @@ -494,7 +498,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
|
| WebContents* newtab = NULL;
|
| ASSERT_NO_FATAL_FAILURE(
|
| OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
|
| - GURL(std::string("chrome-extension://") + last_loaded_extension_id() +
|
| + GURL(std::string(extensions::kExtensionScheme) +
|
| + content::kStandardSchemeSeparator + last_loaded_extension_id() +
|
| "/newtab.html"), false, &newtab));
|
|
|
| // Extension API should succeed.
|
|
|