diff options
100 files changed, 345 insertions, 329 deletions
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 579adb3..9ae387b 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -97,9 +97,9 @@ bool AwContentRendererClient::HandleNavigation( // For HTTP schemes, only top-level navigations can be overridden. Similarly, // WebView Classic lets app override only top level about:blank navigations. // So we filter out non-top about:blank navigations here. - if (frame->parent() && (gurl.SchemeIs(url::kHttpScheme) || - gurl.SchemeIs(url::kHttpsScheme) || - gurl.SchemeIs(content::kAboutScheme))) + if (frame->parent() && + (gurl.SchemeIs(url::kHttpScheme) || gurl.SchemeIs(url::kHttpsScheme) || + gurl.SchemeIs(url::kAboutScheme))) return false; // use NavigationInterception throttle to handle the call as that can diff --git a/apps/launcher.cc b/apps/launcher.cc index 8cfbee9..72ed788 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -411,9 +411,9 @@ void LaunchPlatformAppWithCommandLine(Profile* profile, #if defined(OS_WIN) base::CommandLine::StringType about_blank_url( - base::ASCIIToWide(content::kAboutBlankURL)); + base::ASCIIToWide(url::kAboutBlankURL)); #else - base::CommandLine::StringType about_blank_url(content::kAboutBlankURL); + base::CommandLine::StringType about_blank_url(url::kAboutBlankURL); #endif CommandLine::StringVector args = command_line.GetArgs(); // Browser tests will add about:blank to the command line. This should diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index ea6cfc7..1bd65ad 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -389,7 +389,7 @@ AutocompleteControllerAndroid::ClassifyPage(const GURL& gurl, AutocompleteInput::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS; } - if (url == content::kAboutBlankURL) + if (url == url::kAboutBlankURL) return AutocompleteInput::BLANK; if (url == profile_->GetPrefs()->GetString(prefs::kHomePage)) diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index 3246da5..77fd3c5 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -78,16 +78,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) { OmniboxView* omnibox_view = location_bar->GetOmniboxView(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across // platforms. location_bar->FocusLocation(true); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); EXPECT_TRUE(omnibox_view->IsSelectAll()); omnibox_view->SetUserText(base::ASCIIToUTF16("chrome")); @@ -99,16 +97,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) { omnibox_view->RevertAll(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); omnibox_view->SetUserText(base::ASCIIToUTF16("chrome")); location_bar->Revert(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); } @@ -161,8 +157,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) { { location_bar->Revert(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); EXPECT_FALSE(omnibox_view->IsSelectAll()); const AutocompleteResult& result = autocomplete_controller->result(); EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result); @@ -182,20 +177,18 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) { // and select all. LocationBar* location_bar = GetLocationBar(); OmniboxView* omnibox_view = location_bar->GetOmniboxView(); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); omnibox_view->SetUserText(base::string16()); content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL), + chrome::AddSelectedTabWithURL(browser(), + GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); chrome::CloseTab(browser()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); EXPECT_TRUE(omnibox_view->IsSelectAll()); } @@ -213,8 +206,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) { // Focus search when omnibox is blank { EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), - omnibox_view->GetText()); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText()); location_bar->FocusSearch(); EXPECT_FALSE(location_bar->GetDestinationURL().is_valid()); diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc index e9e08cf..e8b0217 100644 --- a/chrome/browser/autocomplete/builtin_provider.cc +++ b/chrome/browser/autocomplete/builtin_provider.cc @@ -70,8 +70,9 @@ void BuiltinProvider::Start(const AutocompleteInput& input, (input.type() == metrics::OmniboxInputType::QUERY)) return; - const size_t kAboutSchemeLength = strlen(content::kAboutScheme); - const base::string16 kAbout = base::ASCIIToUTF16(content::kAboutScheme) + + const size_t kAboutSchemeLength = strlen(url::kAboutScheme); + const base::string16 kAbout = + base::ASCIIToUTF16(url::kAboutScheme) + base::ASCIIToUTF16(url::kStandardSchemeSeparator); const base::string16 kChrome = base::ASCIIToUTF16(content::kChromeUIScheme) + base::ASCIIToUTF16(url::kStandardSchemeSeparator); @@ -110,12 +111,12 @@ void BuiltinProvider::Start(const AutocompleteInput& input, // Chrome does not support trailing slashes or paths for about:blank. const base::string16 blank_host = base::ASCIIToUTF16("blank"); const base::string16 host = base::UTF8ToUTF16(url.host()); - if (StartsWith(text, base::ASCIIToUTF16(content::kAboutScheme), false) && + if (StartsWith(text, base::ASCIIToUTF16(url::kAboutScheme), false) && StartsWith(blank_host, host, false) && (url.path().length() <= 1) && !EndsWith(text, base::ASCIIToUTF16("/"), false)) { ACMatchClassifications styles; styles.push_back(ACMatchClassification(0, kMatch)); - base::string16 match = base::ASCIIToUTF16(content::kAboutBlankURL); + base::string16 match = base::ASCIIToUTF16(url::kAboutBlankURL); // Measure the length of the matching host after the "about:" scheme. const size_t corrected_length = kAboutSchemeLength + 1 + host.length(); if (blank_host.length() > host.length()) diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc index e99751e..8036e33 100644 --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc +++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc @@ -60,7 +60,7 @@ class BuiltinProviderTest : public testing::Test { #if !defined(OS_ANDROID) TEST_F(BuiltinProviderTest, TypingScheme) { - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme); + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme); const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme); const base::string16 kSeparator1 = ASCIIToUTF16(":"); const base::string16 kSeparator2 = ASCIIToUTF16(":/"); @@ -107,7 +107,7 @@ TEST_F(BuiltinProviderTest, TypingScheme) { } #else // Android uses a subset of the URLs TEST_F(BuiltinProviderTest, TypingScheme) { - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme); + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme); const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme); const base::string16 kSeparator1 = ASCIIToUTF16(":"); const base::string16 kSeparator2 = ASCIIToUTF16(":/"); @@ -172,7 +172,7 @@ TEST_F(BuiltinProviderTest, NonChromeURLs) { } TEST_F(BuiltinProviderTest, ChromeURLs) { - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme); + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme); const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme); const base::string16 kSeparator1 = ASCIIToUTF16(":"); const base::string16 kSeparator2 = ASCIIToUTF16(":/"); @@ -225,9 +225,9 @@ TEST_F(BuiltinProviderTest, ChromeURLs) { } TEST_F(BuiltinProviderTest, AboutBlank) { - const base::string16 kAbout = ASCIIToUTF16(content::kAboutScheme); + const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme); const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme); - const base::string16 kAboutBlank = ASCIIToUTF16(content::kAboutBlankURL); + const base::string16 kAboutBlank = ASCIIToUTF16(url::kAboutBlankURL); const base::string16 kBlank = ASCIIToUTF16("blank"); const base::string16 kSeparator1 = ASCIIToUTF16(url::kStandardSchemeSeparator); diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc index 968eb9e..81f9f10 100644 --- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc +++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc @@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, new content::MessageLoopRunner; web_contents_hidden_callback_ = runner->QuitClosure(); chrome::AddSelectedTabWithURL(browser(), - GURL(content::kAboutBlankURL), + GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_AUTO_TOPLEVEL); runner->Run(); web_contents_hidden_callback_.Reset(); diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index a51bda2..e32973a 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -20,8 +20,8 @@ bool WillHandleBrowserAboutURL(GURL* url, *url = URLFixerUpper::FixupURL(url->possibly_invalid_spec(), std::string()); // Check that about: URLs are fixed up to chrome: by URLFixerUpper::FixupURL. - DCHECK((*url == GURL(content::kAboutBlankURL)) || - !url->SchemeIs(content::kAboutScheme)); + DCHECK((*url == GURL(url::kAboutBlankURL)) || + !url->SchemeIs(url::kAboutScheme)); // Only handle chrome://foo/, URLFixerUpper::FixupURL translates about:foo. if (!url->SchemeIs(content::kChromeUIScheme)) diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc index d70ed8f..0ef582d 100644 --- a/chrome/browser/browser_about_handler_unittest.cc +++ b/chrome/browser/browser_about_handler_unittest.cc @@ -28,8 +28,8 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) { GURL("http://google.com") }, { - GURL(content::kAboutBlankURL), - GURL(content::kAboutBlankURL) + GURL(url::kAboutBlankURL), + GURL(url::kAboutBlankURL) }, { GURL(chrome_prefix + chrome::kChromeUIMemoryHost), diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 4e9239b..45497e6 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -26,7 +26,7 @@ using content::WebContents; // Tests IDC_SELECT_TAB_0, IDC_SELECT_NEXT_TAB, IDC_SELECT_PREVIOUS_TAB and // IDC_SELECT_LAST_TAB. TEST_F(BrowserCommandsTest, TabNavigationAccelerators) { - GURL about_blank(content::kAboutBlankURL); + GURL about_blank(url::kAboutBlankURL); // Create three tabs. AddTab(browser(), about_blank); diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc index f39c4a9..5dfb3f9 100644 --- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc @@ -70,7 +70,7 @@ TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) { TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) { EXPECT_FALSE(IsWebScheme(extensions::kExtensionScheme)); - EXPECT_FALSE(IsWebScheme(content::kAboutScheme)); + EXPECT_FALSE(IsWebScheme(url::kAboutScheme)); EXPECT_FALSE(IsWebScheme(content::kChromeDevToolsScheme)); EXPECT_FALSE(IsWebScheme(content::kChromeUIScheme)); EXPECT_FALSE(IsWebScheme(url::kJavaScriptScheme)); @@ -94,7 +94,7 @@ TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) { TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) { EXPECT_TRUE(IsExtensionScheme(extensions::kExtensionScheme)); - EXPECT_FALSE(IsExtensionScheme(content::kAboutScheme)); + EXPECT_FALSE(IsExtensionScheme(url::kAboutScheme)); EXPECT_FALSE(IsExtensionScheme(content::kChromeDevToolsScheme)); EXPECT_FALSE(IsExtensionScheme(content::kChromeUIScheme)); EXPECT_FALSE(IsExtensionScheme(url::kJavaScriptScheme)); diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 7a7d6dd..67a9e3e 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -2064,7 +2064,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { browser()->host_desktop_type())); // Navigate the new browser window so it'll be shown and we can pick the // active window. - ui_test_utils::NavigateToURL(browser2, GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser2, GURL(url::kAboutBlankURL)); // Generally, |browser2| will be the active window. However, if the // original browser window lost focus before creating the new one, such as diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc index 219f890..ea11737 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc @@ -65,7 +65,7 @@ UserImageScreen::UserImageScreen(ScreenObserver* screen_observer, accept_photo_after_decoding_(false), selected_image_(User::kInvalidImageIndex), profile_picture_enabled_(false), - profile_picture_data_url_(content::kAboutBlankURL), + profile_picture_data_url_(url::kAboutBlankURL), profile_picture_absent_(false), is_screen_ready_(false), user_has_selected_image_(false) { diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index c437e7d..69f1958 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -1334,7 +1334,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) { // Open a second tab and wait. EXPECT_NE(static_cast<WebContents*>(NULL), chrome::AddSelectedTabWithURL(browser(), - GURL(content::kAboutBlankURL), + GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED)); EXPECT_EQ(2, browser()->tab_strip_model()->count()); EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible()); diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index bcd1b2c..586a0d7 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -624,7 +624,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, } IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, NoSave) { - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); EXPECT_FALSE(chrome::CanSavePage(browser())); } diff --git a/chrome/browser/extensions/activity_log/uma_policy.cc b/chrome/browser/extensions/activity_log/uma_policy.cc index 9073591..2fbb064 100644 --- a/chrome/browser/extensions/activity_log/uma_policy.cc +++ b/chrome/browser/extensions/activity_log/uma_policy.cc @@ -186,7 +186,7 @@ int UmaPolicy::MatchActionToStatus(scoped_refptr<Action> action) { void UmaPolicy::HistogramOnClose(const std::string& cleaned_url, content::WebContents* web_contents) { // Let's try to avoid histogramming useless URLs. - if (cleaned_url.empty() || cleaned_url == content::kAboutBlankURL || + if (cleaned_url.empty() || cleaned_url == url::kAboutBlankURL || cleaned_url == chrome::kChromeUINewTabURL) return; @@ -395,7 +395,7 @@ void UmaPolicy::CleanupClosedPage(const std::string& cleaned_url, // We convert to a string in the hopes that this is faster than Replacements. std::string UmaPolicy::CleanURL(const GURL& gurl) { if (gurl.spec().empty()) - return GURL(content::kAboutBlankURL).spec(); + return GURL(url::kAboutBlankURL).spec(); if (!gurl.is_valid()) return gurl.spec(); if (!gurl.has_ref()) diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc index 2e6c69d..7e1e7c6 100644 --- a/chrome/browser/extensions/api/tabs/tabs_test.cc +++ b/chrome/browser/extensions/api/tabs/tabs_test.cc @@ -393,7 +393,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, QueryCurrentWindowTabs) { for (size_t i = 0; i < kExtraWindows; ++i) CreateBrowser(browser()->profile()); - GURL url(content::kAboutBlankURL); + GURL url(url::kAboutBlankURL); AddTabAtIndexToBrowser(browser(), 0, url, content::PAGE_TRANSITION_LINK); int window_id = ExtensionTabUtil::GetWindowId(browser()); @@ -510,10 +510,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, InvalidUpdateWindowState) { } IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTab) { - content::OpenURLParams params(GURL(content::kAboutBlankURL), + content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + content::PAGE_TRANSITION_LINK, + false); content::WebContents* web_contents = browser()->OpenURL(params); int tab_id = ExtensionTabUtil::GetTabId(web_contents); int window_id = ExtensionTabUtil::GetWindowIdOfTab(web_contents); @@ -553,10 +554,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTab) { } IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTabNoPermission) { - content::OpenURLParams params(GURL(content::kAboutBlankURL), + content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(), NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, false); + content::PAGE_TRANSITION_LINK, + false); content::WebContents* web_contents = browser()->OpenURL(params); int tab_id = ExtensionTabUtil::GetTabId(web_contents); int window_id = ExtensionTabUtil::GetWindowIdOfTab(web_contents); diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index c322615..becb1ab 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc @@ -81,7 +81,7 @@ bool FrameNavigationState::IsValidUrl(const GURL& url) const { return true; } // Allow about:blank and about:srcdoc. - if (url.spec() == content::kAboutBlankURL || + if (url.spec() == url::kAboutBlankURL || url.spec() == content::kAboutSrcDocURL) { return true; } @@ -101,7 +101,7 @@ void FrameNavigationState::TrackFrame(FrameID frame_id, frame_state.url = url; frame_state.is_main_frame = is_main_frame; frame_state.is_iframe_srcdoc = is_iframe_srcdoc; - DCHECK(!is_iframe_srcdoc || url == GURL(content::kAboutBlankURL)); + DCHECK(!is_iframe_srcdoc || url == GURL(url::kAboutBlankURL)); frame_state.is_navigating = true; frame_state.is_committed = false; frame_state.is_server_redirected = false; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index 392d749..bbade50 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -537,7 +537,7 @@ void WebNavigationTabObserver::DidFinishLoad( DCHECK( navigation_state_.GetUrl(frame_id) == validated_url || (navigation_state_.GetUrl(frame_id) == GURL(content::kAboutSrcDocURL) && - validated_url == GURL(content::kAboutBlankURL))) + validated_url == GURL(url::kAboutBlankURL))) << "validated URL is " << validated_url << " but we expected " << navigation_state_.GetUrl(frame_id); DCHECK_EQ(navigation_state_.IsMainFrame(frame_id), is_main_frame); diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index eaeece0..661b880 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -232,7 +232,7 @@ TEST_F(ExtensionWebRequestTest, BlockingEventPrecedenceRedirect) { net::URLRequestJobFactoryImpl job_factory; job_factory.SetProtocolHandler( - content::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); + url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); context_->set_job_factory(&job_factory); GURL redirect_url("about:redirected"); diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc index 8cf648d..a5d6322 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc @@ -68,11 +68,9 @@ bool IsSensitiveURL(const GURL& url) { // to. Extensions still need specific permissions for a given URL, which is // covered by CanExtensionAccessURL. bool HasWebRequestScheme(const GURL& url) { - return (url.SchemeIs(content::kAboutScheme) || - url.SchemeIs(url::kFileScheme) || + return (url.SchemeIs(url::kAboutScheme) || url.SchemeIs(url::kFileScheme) || url.SchemeIs(url::kFileSystemScheme) || - url.SchemeIs(url::kFtpScheme) || - url.SchemeIs(url::kHttpScheme) || + url.SchemeIs(url::kFtpScheme) || url.SchemeIs(url::kHttpScheme) || url.SchemeIs(url::kHttpsScheme) || url.SchemeIs(extensions::kExtensionScheme)); } @@ -132,7 +130,7 @@ bool WebRequestPermissions::CanExtensionAccessURL( case REQUIRE_HOST_PERMISSION: // about: URLs are not covered in host permissions, but are allowed // anyway. - if (!((url.SchemeIs(content::kAboutScheme) || + if (!((url.SchemeIs(url::kAboutScheme) || extension->permissions_data()->HasHostPermission(url) || url.GetOrigin() == extension->url()))) { return false; diff --git a/chrome/browser/extensions/extension_api_unittest.cc b/chrome/browser/extensions/extension_api_unittest.cc index 4bde121..9b4392f 100644 --- a/chrome/browser/extensions/extension_api_unittest.cc +++ b/chrome/browser/extensions/extension_api_unittest.cc @@ -34,7 +34,7 @@ void ExtensionApiUnittest::CreateBackgroundPage() { if (!contents_) { GURL url = BackgroundInfo::GetBackgroundURL(extension()); if (url.is_empty()) - url = GURL(content::kAboutBlankURL); + url = GURL(url::kAboutBlankURL); AddTab(browser(), url); contents_ = browser()->tab_strip_model()->GetActiveWebContents(); } diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc index 1028b74..7b8e4f4 100644 --- a/chrome/browser/guest_view/web_view/web_view_guest.cc +++ b/chrome/browser/guest_view/web_view/web_view_guest.cc @@ -1130,8 +1130,8 @@ void WebViewGuest::NavigateGuest(const std::string& src) { // chrome://settings. bool scheme_is_blocked = (!content::ChildProcessSecurityPolicy::GetInstance()->IsWebSafeScheme( - url.scheme()) && - !url.SchemeIs(content::kAboutScheme)) || + url.scheme()) && + !url.SchemeIs(url::kAboutScheme)) || url.SchemeIs(url::kJavaScriptScheme); if (scheme_is_blocked || !url.is_valid()) { std::string error_type(net::ErrorToString(net::ERR_ABORTED)); diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 497f1aa..6c6761f 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -444,7 +444,7 @@ void HistoryBackend::AddPage(const HistoryAddPageArgs& request) { content::PAGE_TRANSITION_CHAIN_START; RedirectList redirects = request.redirects; - if (redirects[0].SchemeIs(content::kAboutScheme)) { + if (redirects[0].SchemeIs(url::kAboutScheme)) { // When the redirect source + referrer is "about" we skip it. This // happens when a page opens a new frame/window to about:blank and then // script sets the URL to somewhere else (used to hide the referrer). It diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 7010dea..507ec29 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -494,7 +494,9 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, OneHistoryTabPerWindow) { EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); chrome::ExecuteCommand(browser(), IDC_SHOW_HISTORY); diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index a4513e1..ba14f5f 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -971,7 +971,7 @@ bool HistoryService::CanAddURL(const GURL& url) { // Allow all about: and chrome: URLs except about:blank, since the user may // like to see "chrome://memory/", etc. in their history and autocomplete. - if (url == GURL(content::kAboutBlankURL)) + if (url == GURL(url::kAboutBlankURL)) return false; return true; diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc index a5c1c47..38eb30c 100644 --- a/chrome/browser/history/in_memory_url_index.cc +++ b/chrome/browser/history/in_memory_url_index.cc @@ -38,7 +38,7 @@ void InitializeSchemeWhitelist(std::set<std::string>* whitelist) { DCHECK(whitelist); if (!whitelist->empty()) return; // Nothing to do, already initialized. - whitelist->insert(std::string(content::kAboutScheme)); + whitelist->insert(std::string(url::kAboutScheme)); whitelist->insert(std::string(content::kChromeUIScheme)); whitelist->insert(std::string(url::kFileScheme)); whitelist->insert(std::string(url::kFtpScheme)); diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 6a40f263..df2bb9a 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -940,7 +940,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) { EXPECT_EQ(expected, web_contents->GetURL()); // Verify that searching from the omnibox can be disabled. - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false), NULL); EXPECT_TRUE(service->GetDefaultSearchProvider()); @@ -949,7 +949,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) { ui_test_utils::SendToOmniboxAndSubmit(location_bar, "should not work"); // This means that submitting won't trigger any action. EXPECT_FALSE(model->CurrentMatch(NULL).destination_url.is_valid()); - EXPECT_EQ(GURL(content::kAboutBlankURL), web_contents->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), web_contents->GetURL()); } IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyPreprocessing) { @@ -1159,7 +1159,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) { if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL)) return; - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); // WebGL is enabled by default. content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -1751,7 +1751,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) { browser()->profile()->GetHomePage()); content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(GURL(content::kAboutBlankURL), contents->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), contents->GetURL()); EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME)); EXPECT_EQ(GURL(chrome::kChromeUIPolicyURL), contents->GetURL()); @@ -1816,7 +1816,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) { POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false), NULL); UpdateProviderPolicy(policies); // Reload the page. - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); EXPECT_FALSE(IsJavascriptEnabled(contents)); // Developer tools still work when javascript is disabled. EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEV_TOOLS)); @@ -1827,13 +1827,13 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) { EXPECT_TRUE(IsJavascriptEnabled(contents)); // The javascript content setting policy overrides the javascript policy. - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); EXPECT_FALSE(IsJavascriptEnabled(contents)); policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW), NULL); UpdateProviderPolicy(policies); - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); EXPECT_TRUE(IsJavascriptEnabled(contents)); } @@ -2641,7 +2641,7 @@ IN_PROC_BROWSER_TEST_F(PolicyStatisticsCollectorTest, Startup) { // CompleteInitialization() task has executed as well. content::RunAllPendingInMessageLoop(); - GURL kAboutHistograms = GURL(std::string(content::kAboutScheme) + + GURL kAboutHistograms = GURL(std::string(url::kAboutScheme) + std::string(url::kStandardSchemeSeparator) + std::string(content::kChromeUIHistogramHost)); ui_test_utils::NavigateToURL(browser(), kAboutHistograms); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index fbf7c9b..c9befd9 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -2904,7 +2904,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTargetHasPopup) { PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_NON_EMPTY_BROWSING_INSTANCE, 1); - OpenURLViaWindowOpen(GURL(content::kAboutBlankURL)); + OpenURLViaWindowOpen(GURL(url::kAboutBlankURL)); NavigateToDestURLWithDisposition(CURRENT_TAB, false); } @@ -4009,8 +4009,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTabCrossProcess) { ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); // Navigate to about:blank so the next navigation is cross-process. - ui_test_utils::NavigateToURL(current_browser(), - GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(current_browser(), GURL(url::kAboutBlankURL)); // Now navigate in the new tab. Set expect_swap_to_succeed to false because // the swap does not occur synchronously. @@ -4063,8 +4062,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReplaceCurrentEntry) { // First entry is about:blank, second is prerender_page.html. EXPECT_TRUE(controller.GetPendingEntry() == NULL); EXPECT_EQ(2, controller.GetEntryCount()); - EXPECT_EQ(GURL(content::kAboutBlankURL), - controller.GetEntryAtIndex(0)->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), controller.GetEntryAtIndex(0)->GetURL()); EXPECT_EQ(dest_url(), controller.GetEntryAtIndex(1)->GetURL()); } @@ -4094,7 +4092,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDoublePendingSwap) { // Open a new tab to navigate in. ui_test_utils::NavigateToURLWithDisposition( - current_browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + current_browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); // Fire off two navigations, without running the event loop between them. @@ -4118,8 +4118,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDoublePendingSwap) { EXPECT_TRUE(controller.GetPendingEntry() == NULL); EXPECT_LE(2, controller.GetEntryCount()); EXPECT_GE(3, controller.GetEntryCount()); - EXPECT_EQ(GURL(content::kAboutBlankURL), - controller.GetEntryAtIndex(0)->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), controller.GetEntryAtIndex(0)->GetURL()); EXPECT_EQ(url2, controller.GetEntryAtIndex( controller.GetEntryCount() - 1)->GetURL()); } @@ -4134,7 +4133,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Open a new tab to navigate in. ui_test_utils::NavigateToURLWithDisposition( - current_browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + current_browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); // Navigate to the URL. Wait for DidStartLoading, just so it's definitely @@ -4150,9 +4151,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, // Navigate somewhere else. This should succeed and abort the pending swap. TestNavigationObserver nav_observer(GetActiveWebContents()); - current_browser()->OpenURL(OpenURLParams( - GURL(content::kAboutBlankURL), Referrer(), CURRENT_TAB, - content::PAGE_TRANSITION_TYPED, false)); + current_browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), + Referrer(), + CURRENT_TAB, + content::PAGE_TRANSITION_TYPED, + false)); nav_observer.Wait(); } diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 85d861e..c6ced3c1 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -926,7 +926,7 @@ bool PrerenderManager::DoesURLHaveValidScheme(const GURL& url) { // static bool PrerenderManager::DoesSubresourceURLHaveValidScheme(const GURL& url) { - return DoesURLHaveValidScheme(url) || url == GURL(content::kAboutBlankURL); + return DoesURLHaveValidScheme(url) || url == GURL(url::kAboutBlankURL); } base::DictionaryValue* PrerenderManager::GetAsValue() const { diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 5e4e92d..97b27a2 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -626,7 +626,7 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { #if defined(OS_CHROMEOS) chrome::kDriveScheme, #endif // defined(OS_CHROMEOS) - content::kAboutScheme, + url::kAboutScheme, #if !defined(DISABLE_FTP_SUPPORT) url::kFtpScheme, #endif // !defined(DISABLE_FTP_SUPPORT) @@ -1066,7 +1066,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( #endif // defined(OS_CHROMEOS) job_factory->SetProtocolHandler( - content::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); + url::kAboutScheme, new chrome_browser_net::AboutProtocolHandler()); #if !defined(DISABLE_FTP_SUPPORT) DCHECK(ftp_transaction_factory); job_factory->SetProtocolHandler( diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index d0e3a34..275df6d2 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -681,9 +681,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareDontProceed) { EXPECT_TRUE(ClickAndWaitForDetach("back")); AssertNoInterstitial(false); // Assert the interstitial is gone - EXPECT_EQ( - GURL(content::kAboutBlankURL), // Back to "about:blank" - browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), // Back to "about:blank" + browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) { @@ -733,9 +732,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, EXPECT_TRUE(ClickAndWaitForDetach("back")); AssertNoInterstitial(false); // Assert the interstitial is gone - EXPECT_EQ( - GURL(content::kAboutBlankURL), // Back to "about:blank" - browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), // Back to "about:blank" + browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeProceed) { @@ -822,9 +820,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) { // The "proceed" command should go back instead, if proceeding is disabled. EXPECT_TRUE(ClickAndWaitForDetach("proceed")); AssertNoInterstitial(true); - EXPECT_EQ( - GURL(content::kAboutBlankURL), // Back to "about:blank" - browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), // Back to "about:blank" + browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); } // Verifies that the reporting checkbox is hidden on non-HTTP pages. @@ -858,9 +855,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) { EXPECT_TRUE(ClickAndWaitForDetach("back")); AssertNoInterstitial(false); // Assert the interstitial is gone - EXPECT_EQ( - GURL(content::kAboutBlankURL), // Back to "about:blank" - browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), // Back to "about:blank" + browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) { @@ -886,9 +882,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) { EXPECT_TRUE(ClickAndWaitForDetach("back")); AssertNoInterstitial(false); // Assert the interstitial is gone - EXPECT_EQ( - GURL(content::kAboutBlankURL), // We are back to "about:blank". - browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), // We are back to "about:blank". + browser()->tab_strip_model()->GetActiveWebContents()->GetURL()); } // http://crbug.com/247763 diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index 096c637..2c04cd1 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -680,8 +680,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionCookies) { IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionCookies) { content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); // When we navigate to the page again, it doens't see the data previously // stored. StoreDataWithPage("session_cookies.html"); @@ -694,8 +693,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_SessionStorage) { IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, SessionStorage) { content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); StoreDataWithPage("session_storage.html"); } @@ -708,8 +706,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) { // Normally localStorage is persisted. content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); NavigateAndCheckStoredData("local_storage.html"); // ... but not if it's set to clear on exit. CookieSettings::Factory::GetForProfile(browser()->profile())-> @@ -719,8 +716,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_LocalStorageClearedOnExit) { IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, LocalStorageClearedOnExit) { content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); StoreDataWithPage("local_storage.html"); } @@ -732,8 +728,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) { // Normally cookies are restored. content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); NavigateAndCheckStoredData("cookies.html"); // ... but not if the content setting is set to clear on exit. CookieSettings::Factory::GetForProfile(browser()->profile())-> @@ -743,8 +738,7 @@ IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, PRE_CookiesClearedOnExit) { IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) { content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); - EXPECT_EQ(std::string(content::kAboutBlankURL), - web_contents->GetURL().spec()); + EXPECT_EQ(std::string(url::kAboutBlankURL), web_contents->GetURL().spec()); StoreDataWithPage("local_storage.html"); } diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 029200b..5424bca 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -199,10 +199,14 @@ class SessionRestoreTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoredTabsShouldHaveRootWindow) { // Create tabs. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_BACKGROUND_TAB, + browser(), + GURL(url::kAboutBlankURL), + NEW_BACKGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); // Restart and session restore the tabs. @@ -950,7 +954,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) { // Open a second window. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, + browser(), + GURL(url::kAboutBlankURL), + NEW_WINDOW, ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); ASSERT_EQ(2u, active_browser_list_->size()); @@ -983,10 +989,14 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) { IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ShareProcessesOnRestore) { // Create two new tabs. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_FOREGROUND_TAB, + browser(), + GURL(url::kAboutBlankURL), + NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); int expected_process_count = RenderProcessHostCount(); diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc index bc21ac4..e5fd5a0 100644 --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc @@ -466,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WebUI) { DontCheckTitle); // Check that the new popup displays about:blank. - EXPECT_EQ(GURL(content::kAboutBlankURL), popup->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), popup->GetURL()); } // Verify that the renderer can't DOS the browser by creating arbitrarily many diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc index 8d15774..ca6ac84 100644 --- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc @@ -23,9 +23,10 @@ TEST_F(BookmarkTest, DetachedBookmarkBarOnCustomNTP) { // Create a empty commited web contents. content::WebContents* web_contents = content::WebContents::Create( content::WebContents::CreateParams(browser()->profile())); - web_contents->GetController().LoadURL( - GURL(content::kAboutBlankURL), content::Referrer(), - content::PAGE_TRANSITION_LINK, std::string()); + web_contents->GetController().LoadURL(GURL(url::kAboutBlankURL), + content::Referrer(), + content::PAGE_TRANSITION_LINK, + std::string()); // Give it a NTP virtual URL. content::NavigationController* controller = &web_contents->GetController(); diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3461fcb..b379338 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -1170,7 +1170,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) { ui_test_utils::NavigateToURL(browser(), downloads_url); EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); - GURL blank_url(content::kAboutBlankURL); + GURL blank_url(url::kAboutBlankURL); ui_test_utils::NavigateToURL(browser(), blank_url); EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); } @@ -1484,7 +1484,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { // Add a pinned non-app tab. chrome::NewTab(browser()); - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); model->SetTabPinned(2, true); // Write out the pinned tabs. @@ -1624,7 +1624,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_StartMinimized) { // Makes sure the forward button is disabled immediately when navigating // forward to a slow-to-commit page. IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) { - GURL blank_url(content::kAboutBlankURL); + GURL blank_url(url::kAboutBlankURL); ui_test_utils::NavigateToURL(browser(), blank_url); ui_test_utils::NavigateToURL( @@ -2084,7 +2084,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { EXPECT_EQ(1, app_browser->tab_strip_model()->count()); // Now try opening another tab in the app browser. - AddTabWithURLParams params2(GURL(content::kAboutBlankURL), + AddTabWithURLParams params2(GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); app_browser->AddTabWithURL(¶ms2); EXPECT_EQ(app_browser, params2.target); @@ -2102,7 +2102,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { EXPECT_EQ(1, app_popup_browser->tab_strip_model()->count()); // Now try opening another tab in the app popup browser. - AddTabWithURLParams params3(GURL(content::kAboutBlankURL), + AddTabWithURLParams params3(GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); app_popup_browser->AddTabWithURL(¶ms3); EXPECT_EQ(app_popup_browser, params3.target); diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index cbc544c..23fa01d 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -178,7 +178,8 @@ class BrowserCloseTest : public InProcessBrowserTest { chrome::HostDesktopType host_desktop_type) { Browser* new_browser = new Browser(Browser::CreateParams(profile, host_desktop_type)); - chrome::AddSelectedTabWithURL(new_browser, GURL(content::kAboutBlankURL), + chrome::AddSelectedTabWithURL(new_browser, + GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_AUTO_TOPLEVEL); content::WaitForLoadStop( new_browser->tab_strip_model()->GetActiveWebContents()); diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 5779283..c39bea7 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -519,8 +519,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); // Open about:blank, focus should be on the location bar. - chrome::AddSelectedTabWithURL(browser(), GURL(content::kAboutBlankURL), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL( + browser(), GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop( browser()->tab_strip_model()->GetActiveWebContents())); EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX)); diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 4af97b9..3a3eddb 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -192,7 +192,7 @@ void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest( // The page should not be opened. EXPECT_EQ(browser, p.browser); EXPECT_EQ(1, browser->tab_strip_model()->count()); - EXPECT_EQ(GURL(content::kAboutBlankURL), + EXPECT_EQ(GURL(url::kAboutBlankURL), browser->tab_strip_model()->GetActiveWebContents()->GetURL()); } @@ -1084,7 +1084,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromBlankToOptionsInSameTab) { chrome::NavigateParams p(MakeNavigateParams()); - p.url = GURL(content::kAboutBlankURL); + p.url = GURL(url::kAboutBlankURL); ui_test_utils::NavigateToURL(&p); { diff --git a/chrome/browser/ui/browser_tabrestore_browsertest.cc b/chrome/browser/ui/browser_tabrestore_browsertest.cc index 4c8e28e..fe3e7ad 100644 --- a/chrome/browser/ui/browser_tabrestore_browsertest.cc +++ b/chrome/browser/ui/browser_tabrestore_browsertest.cc @@ -69,7 +69,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { // Create a new browser. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, + browser(), + GURL(url::kAboutBlankURL), + NEW_WINDOW, ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); BrowserList* active_browser_list = BrowserList::GetInstance(browser()->host_desktop_type()); @@ -103,7 +105,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { // Create a new browser. ui_test_utils::NavigateToURLWithDisposition( - browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, + browser(), + GURL(url::kAboutBlankURL), + NEW_WINDOW, ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); BrowserList* active_browser_list = BrowserList::GetInstance(browser()->host_desktop_type()); diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index c64695a..5dbd9b4 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -59,9 +59,9 @@ class ViewIDTest : public InProcessBrowserTest { if (!bookmark_model->loaded()) test::WaitForBookmarkModelToLoad(bookmark_model); - bookmark_utils::AddIfNotBookmarked( - bookmark_model, GURL(content::kAboutBlankURL), - base::ASCIIToUTF16("about")); + bookmark_utils::AddIfNotBookmarked(bookmark_model, + GURL(url::kAboutBlankURL), + base::ASCIIToUTF16("about")); } for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { @@ -107,17 +107,21 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Tab) { // Open 9 new tabs. for (int i = 1; i <= 9; ++i) { CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false); - browser()->OpenURL(OpenURLParams( - GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_TYPED, false)); + browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), + Referrer(), + NEW_BACKGROUND_TAB, + content::PAGE_TRANSITION_TYPED, + false)); CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true); // VIEW_ID_TAB_LAST should always be available. CheckViewID(VIEW_ID_TAB_LAST, true); } // Open the 11th tab. - browser()->OpenURL(OpenURLParams( - GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, - content::PAGE_TRANSITION_TYPED, false)); + browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), + Referrer(), + NEW_BACKGROUND_TAB, + content::PAGE_TRANSITION_TYPED, + false)); CheckViewID(VIEW_ID_TAB_LAST, true); } diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 0e9d574..0ad74f0 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -1397,8 +1397,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FitWindow) { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(popup, GURL(content::kAboutBlankURL), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL( + popup, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); // Wait for the page to finish loading. observer.Wait(); popup->window()->Show(); @@ -1607,7 +1607,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, WindowedNPAPIPluginHidden) { // Create a new tab and open the find bar there. chrome::NewTab(browser()); browser()->tab_strip_model()->ActivateTabAt(1, true); - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); EnsureFindBoxOpen(); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 84f7081..210ca2f 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -20,7 +20,7 @@ #include "base/mac/mac_util.h" #endif -using content::kAboutBlankURL; +using url::kAboutBlankURL; using content::WebContents; using content::PAGE_TRANSITION_TYPED; @@ -29,8 +29,8 @@ class FullscreenControllerBrowserTest: public FullscreenControllerTest { IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PendingMouseLockExitsOnTabSwitch) { - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents(); // Request mouse lock. Bubble is displayed. @@ -63,8 +63,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, PendingMouseLockExitsOnTabClose) { // Add more tabs. - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); // Request mouse lock. Bubble is displayed. RequestToLockMouse(true, false); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc index 2f81dfb..a040d1a 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc @@ -22,7 +22,7 @@ #include "base/mac/mac_util.h" #endif -using content::kAboutBlankURL; +using url::kAboutBlankURL; using content::WebContents; using content::PAGE_TRANSITION_TYPED; @@ -181,13 +181,13 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestNewTabExitsFullscreen) { ASSERT_TRUE(test_server()->Start()); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); { FullscreenNotificationObserver fullscreen_observer; - AddTabAtIndex(1, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); fullscreen_observer.Wait(); ASSERT_FALSE(browser()->window()->IsFullscreen()); } @@ -199,7 +199,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestTabExitsItselfFromFullscreen) { ASSERT_TRUE(test_server()->Start()); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); @@ -212,8 +212,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, DISABLED_TestFullscreenBubbleMouseLockState) { ASSERT_TRUE(test_server()->Start()); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); - AddTabAtIndex(1, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(1, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); @@ -252,7 +252,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); // Enter tab fullscreen. - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); // Exit browser fullscreen. @@ -268,7 +268,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); // Enter and then exit tab fullscreen. - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(true)); ASSERT_NO_FATAL_FAILURE(ToggleTabFullscreen(false)); @@ -363,7 +363,7 @@ IN_PROC_BROWSER_TEST_F( FullscreenControllerTest, DISABLED_TabEntersPresentationModeFromWindowed) { ASSERT_TRUE(test_server()->Start()); - AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc index 33bcea7..01c7ac3 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc @@ -54,8 +54,7 @@ Browser* FullscreenControllerStateInteractiveTest::GetBrowser() { IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, DISABLED_TransitionsForEachState) { // A tab is needed for tab fullscreen. - AddTabAtIndex(0, GURL(content::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); TestTransitionsForEachState(); // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog(); } @@ -66,17 +65,16 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, // An "empty" test is included as part of each "TEST_EVENT" because it makes // running the entire test suite less flaky on MacOS. All of the tests pass // when run individually. -#define TEST_EVENT(state, event) \ - IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ - DISABLED_##state##__##event##__Empty) { \ - } \ - IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ - DISABLED_##state##__##event) { \ - AddTabAtIndex(0, GURL(content::kAboutBlankURL), \ - content::PAGE_TRANSITION_TYPED); \ - ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ - << GetAndClearDebugLog(); \ - } +#define TEST_EVENT(state, event) \ + IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ + DISABLED_##state##__##event##__Empty) {} \ + IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, \ + DISABLED_##state##__##event) { \ + AddTabAtIndex( \ + 0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); \ + ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ + << GetAndClearDebugLog(); \ + } // Progress of tests can be examined by inserting the following line: // LOG(INFO) << GetAndClearDebugLog(); } @@ -89,8 +87,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerStateInteractiveTest, DISABLED_ManualTest) { // A tab is needed for tab fullscreen. - AddTabAtIndex(0, GURL(content::kAboutBlankURL), - content::PAGE_TRANSITION_TYPED); + AddTabAtIndex(0, GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)) << GetAndClearDebugLog(); ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)) << GetAndClearDebugLog(); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc index e065327..16f41b7 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc @@ -326,7 +326,7 @@ Browser* FullscreenControllerStateUnitTest::GetBrowser() { // exist. TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) { // A tab is needed for tab fullscreen. - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); TestTransitionsForEachState(); // Progress of test can be examined via LOG(INFO) << GetAndClearDebugLog(); } @@ -334,12 +334,12 @@ TEST_F(FullscreenControllerStateUnitTest, TransitionsForEachState) { // Individual tests for each pair of state and event --------------------------- -#define TEST_EVENT(state, event) \ - TEST_F(FullscreenControllerStateUnitTest, state##__##event) { \ - AddTab(browser(), GURL(content::kAboutBlankURL)); \ - ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ - << GetAndClearDebugLog(); \ - } +#define TEST_EVENT(state, event) \ + TEST_F(FullscreenControllerStateUnitTest, state##__##event) { \ + AddTab(browser(), GURL(url::kAboutBlankURL)); \ + ASSERT_NO_FATAL_FAILURE(TestStateAndEvent(state, event)) \ + << GetAndClearDebugLog(); \ + } // Progress of tests can be examined by inserting the following line: // LOG(INFO) << GetAndClearDebugLog(); } @@ -355,7 +355,7 @@ TEST_F(FullscreenControllerStateUnitTest, // Only possible without reentrancy. if (FullscreenControllerStateTest::IsWindowFullscreenStateChangedReentrant()) return; - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_NO_FATAL_FAILURE( TransitionToState(STATE_TO_BROWSER_FULLSCREEN_NO_CHROME)) << GetAndClearDebugLog(); @@ -371,7 +371,7 @@ TEST_F(FullscreenControllerStateUnitTest, DISABLED_ToggleTabWhenPendingTab) { // Only possible without reentrancy. if (FullscreenControllerStateTest::IsWindowFullscreenStateChangedReentrant()) return; - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_NO_FATAL_FAILURE( TransitionToState(STATE_TO_TAB_FULLSCREEN)) << GetAndClearDebugLog(); @@ -417,7 +417,7 @@ TEST_F(FullscreenControllerStateUnitTest, DISABLED_DebugLogStateTables) { // This currently occurs when an extension exits fullscreen via changing the // browser bounds. TEST_F(FullscreenControllerStateUnitTest, ExitFullscreenViaBrowserWindow) { - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN)); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)); ASSERT_TRUE(browser()->window()->IsFullscreen()); @@ -430,8 +430,8 @@ TEST_F(FullscreenControllerStateUnitTest, ExitFullscreenViaBrowserWindow) { // Test that switching tabs takes the browser out of tab fullscreen. TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaSwitchingTab) { - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)); ASSERT_TRUE(browser()->window()->IsFullscreen()); @@ -445,8 +445,8 @@ TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaSwitchingTab) { // fullscreen) takes the browser out of tab fullscreen. This case can // occur if the user is in both tab fullscreen and immersive browser fullscreen. TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaDetachingTab) { - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)); ASSERT_TRUE(browser()->window()->IsFullscreen()); @@ -461,7 +461,7 @@ TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaDetachingTab) { // takes the browser out of tab fullscreen. This can occur if the user // navigates to a prerendered page from a page which is tab fullscreen. TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaReplacingTab) { - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE)); ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE)); ASSERT_TRUE(browser()->window()->IsFullscreen()); @@ -490,8 +490,8 @@ TEST_F(FullscreenControllerStateUnitTest, OneCapturedFullscreenedTab) { return; } - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::WebContents* const first_tab = browser()->tab_strip_model()->GetWebContentsAt(0); content::WebContents* const second_tab = @@ -557,8 +557,8 @@ TEST_F(FullscreenControllerStateUnitTest, TwoFullscreenedTabsOneCaptured) { return; } - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::WebContents* const first_tab = browser()->tab_strip_model()->GetWebContentsAt(0); content::WebContents* const second_tab = @@ -618,8 +618,8 @@ TEST_F(FullscreenControllerStateUnitTest, return; } - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::WebContents* const first_tab = browser()->tab_strip_model()->GetWebContentsAt(0); content::WebContents* const second_tab = @@ -677,7 +677,7 @@ TEST_F(FullscreenControllerStateUnitTest, return; } - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::WebContents* const tab = browser()->tab_strip_model()->GetWebContentsAt(0); @@ -731,8 +731,8 @@ TEST_F(FullscreenControllerStateUnitTest, return; } - AddTab(browser(), GURL(content::kAboutBlankURL)); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::WebContents* const tab = browser()->tab_strip_model()->GetWebContentsAt(0); @@ -759,7 +759,7 @@ TEST_F(FullscreenControllerStateUnitTest, false, browser()->host_desktop_type(), second_browser_window.get())); - AddTab(second_browser.get(), GURL(content::kAboutBlankURL)); + AddTab(second_browser.get(), GURL(url::kAboutBlankURL)); content::WebContentsDelegate* const second_wc_delegate = static_cast<content::WebContentsDelegate*>(second_browser.get()); diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 2c52de1..60bb805 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -1439,7 +1439,7 @@ AutocompleteInput::PageClassification OmniboxEditModel::ClassifyPage() const { const std::string& url = gurl.spec(); if (url == chrome::kChromeUINewTabURL) return AutocompleteInput::NTP; - if (url == content::kAboutBlankURL) + if (url == url::kAboutBlankURL) return AutocompleteInput::BLANK; if (url == profile()->GetPrefs()->GetString(prefs::kHomePage)) return AutocompleteInput::HOME_PAGE; diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index c38ca67..3e90241 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -734,14 +734,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_EscapeToDefaultMatch) { #define MAYBE_BasicTextOperations BasicTextOperations #endif IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) { - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); chrome::FocusLocationBar(browser()); OmniboxView* omnibox_view = NULL; ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); base::string16 old_text = omnibox_view->GetText(); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), old_text); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), old_text); EXPECT_TRUE(omnibox_view->IsSelectAll()); size_t start, end; @@ -1066,7 +1066,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DeleteItem) { TemplateURLServiceFactory::GetForProfile(browser()->profile()); model->SetUserSelectedDefaultSearchProvider(NULL); - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); chrome::FocusLocationBar(browser()); OmniboxView* omnibox_view = NULL; @@ -1371,14 +1371,14 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, #if defined(TOOLKIT_VIEWS) IN_PROC_BROWSER_TEST_F(OmniboxViewTest, UndoRedo) { - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); chrome::FocusLocationBar(browser()); OmniboxView* omnibox_view = NULL; ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); base::string16 old_text = omnibox_view->GetText(); - EXPECT_EQ(base::UTF8ToUTF16(content::kAboutBlankURL), old_text); + EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), old_text); EXPECT_TRUE(omnibox_view->IsSelectAll()); // Delete the text, then undo. diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 3300fa7..8563773 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -1400,7 +1400,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, // Create a panel with a non-extension host. CreatePanelParams params1(extension_app_name, gfx::Rect(), SHOW_AS_ACTIVE); - params1.url = GURL(content::kAboutBlankURL); + params1.url = GURL(url::kAboutBlankURL); Panel* panel1 = CreatePanelWithParams(params1); EXPECT_EQ(2, panel_manager->num_panels()); diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc index cc8ca49..344618c 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc @@ -173,7 +173,7 @@ class InstantSearchPrerendererTest : public InstantUnitTestBase { void Init(bool prerender_search_results_base_page, bool call_did_finish_load) { - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); content::SessionStorageNamespaceMap session_storage_namespace_map; session_storage_namespace_map[std::string()] = @@ -304,7 +304,7 @@ TEST_F(InstantSearchPrerendererTest, CancelPrerenderRequestOnTabChangeEvent) { EXPECT_NE(static_cast<PrerenderHandle*>(NULL), prerender_handle()); // Add a new tab to deactivate the current tab. - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); EXPECT_EQ(2, browser()->tab_strip_model()->count()); // Make sure the pending prerender request is cancelled. @@ -324,7 +324,7 @@ TEST_F(InstantSearchPrerendererTest, PrerenderingAllowed) { Init(true, true); InstantSearchPrerenderer* prerenderer = GetInstantSearchPrerenderer(); content::WebContents* active_tab = GetActiveWebContents(); - EXPECT_EQ(GURL(content::kAboutBlankURL), active_tab->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), active_tab->GetURL()); // Allow prerendering only for search type AutocompleteMatch suggestions. AutocompleteMatch search_type_match(NULL, 1100, false, diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc index 36fba6f..f582d17 100644 --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc @@ -271,7 +271,7 @@ TEST_F(SearchIPCRouterTest, HandleTabChangedEvents) { EXPECT_TRUE(IsActiveTab(contents)); // Add a new tab to deactivate the current tab. - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); EXPECT_EQ(2, browser()->tab_strip_model()->count()); EXPECT_EQ(1, browser()->tab_strip_model()->GetIndexOfWebContents(contents)); EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc index 387b9cd..6ccf89e 100644 --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc @@ -50,7 +50,7 @@ void ShowSingletonTabOverwritingNTP(Browser* browser, if (contents) { const GURL& contents_url = contents->GetURL(); if ((contents_url == GURL(kChromeUINewTabURL) || IsInstantNTP(contents) || - contents_url == GURL(content::kAboutBlankURL)) && + contents_url == GURL(url::kAboutBlankURL)) && GetIndexOfSingletonTab(&local_params) < 0) { local_params.disposition = CURRENT_TAB; } diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 0971f0e..7f3af05 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -444,7 +444,7 @@ std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine( // command line. See ExistingUserController::OnLoginSuccess. (url.spec().find(chrome::kChromeUISettingsURL) == 0) || #endif - (url.spec().compare(content::kAboutBlankURL) == 0)) { + (url.spec().compare(url::kAboutBlankURL) == 0)) { urls.push_back(url); } } diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index e554aa8..11acf13 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -93,8 +93,7 @@ class StartupBrowserCreatorTest : public ExtensionBrowserTest { virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { ExtensionBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kEnablePanels); - command_line->AppendSwitchASCII(switches::kHomePage, - content::kAboutBlankURL); + command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL); #if defined(OS_CHROMEOS) // TODO(nkostylev): Investigate if we can remove this switch. command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests); diff --git a/chrome/browser/ui/toolbar/origin_chip_info.cc b/chrome/browser/ui/toolbar/origin_chip_info.cc index 0550c29..24b36f9 100644 --- a/chrome/browser/ui/toolbar/origin_chip_info.cc +++ b/chrome/browser/ui/toolbar/origin_chip_info.cc @@ -31,7 +31,8 @@ namespace { -// For selected kChromeUIScheme and kAboutScheme, return the string resource +// For selected kChromeUIScheme and url::kAboutScheme, return the string +// resource // number for the title of the page. If we don't have a specialized title, // returns -1. int StringForChromeHost(const GURL& url) { @@ -177,7 +178,7 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url, // About scheme pages. Currently all about: URLs other than about:blank // redirect to chrome: URLs, so this only affects about:blank. - if (url.SchemeIs(content::kAboutScheme)) + if (url.SchemeIs(url::kAboutScheme)) return base::UTF8ToUTF16(url.spec()); // Chrome built-in pages. diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index 7622bba..8ebd65f 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -152,7 +152,7 @@ GURL ToolbarModelImpl::GetURL() const { return ShouldDisplayURL() ? entry->GetVirtualURL() : GURL(); } - return GURL(content::kAboutBlankURL); + return GURL(url::kAboutBlankURL); } bool ToolbarModelImpl::WouldPerformSearchTermReplacement( diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc index 80ad61f..1500300 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc @@ -65,9 +65,9 @@ struct TestItem { true }, { - GURL(content::kAboutBlankURL), - base::ASCIIToUTF16(content::kAboutBlankURL), - base::ASCIIToUTF16(content::kAboutBlankURL), + GURL(url::kAboutBlankURL), + base::ASCIIToUTF16(url::kAboutBlankURL), + base::ASCIIToUTF16(url::kAboutBlankURL), base::string16(), false, true @@ -253,7 +253,7 @@ PopupToolbarModelTest::~PopupToolbarModelTest() { // Test that we only replace URLs when query extraction and URL replacement // are enabled. TEST_F(ToolbarModelTest, ShouldDisplayURL_QueryExtraction) { - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); // Before we enable instant extended, query extraction is disabled. EXPECT_FALSE(chrome::IsQueryExtractionEnabled()) @@ -290,7 +290,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURL_QueryExtraction) { // enabled. TEST_F(ToolbarModelTest, ShouldDisplayURL_OriginChip) { EnableOriginChipFieldTrial(); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); // Check each case with the origin chip enabled but query extraction disabled. EXPECT_TRUE(chrome::ShouldDisplayOriginChip()); @@ -325,7 +325,7 @@ TEST_F(ToolbarModelTest, ShouldDisplayURL_OriginChip) { // Verify that search terms are extracted while the page is loading. TEST_F(ToolbarModelTest, SearchTermsWhileLoading) { chrome::EnableQueryExtractionForTesting(); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); // While loading, we should be willing to extract search terms. content::NavigationController* controller = @@ -351,7 +351,7 @@ TEST_F(ToolbarModelTest, SearchTermsWhileLoading) { // secure. TEST_F(ToolbarModelTest, GoogleBaseURL) { chrome::EnableQueryExtractionForTesting(); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); // If the Google base URL wasn't specified on the command line, then if it's // HTTP, we should not extract search terms. @@ -375,7 +375,7 @@ TEST_F(ToolbarModelTest, GoogleBaseURL) { // ignores whether the origin chip is enabled and only respects the query // extraction flag. TEST_F(PopupToolbarModelTest, ShouldDisplayURL) { - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); // Check with neither query extraction nor the origin chip enabled. EXPECT_FALSE(chrome::ShouldDisplayOriginChip()); diff --git a/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc index 576c6d2..242d2ab 100644 --- a/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc @@ -129,10 +129,10 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, ASSERT_EQ(S_OK, hr); ASSERT_TRUE(NULL != acc_obj); - ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); - std::wstring title = UTF16ToWide(l10n_util::GetStringFUTF16( - IDS_BROWSER_WINDOW_TITLE_FORMAT, - base::ASCIIToUTF16(content::kAboutBlankURL))); + ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); + std::wstring title = UTF16ToWide( + l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, + base::ASCIIToUTF16(url::kAboutBlankURL))); TestAccessibilityInfo(acc_obj, title, ROLE_SYSTEM_WINDOW); } diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc index b6c4525..eb810ab 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views_unittest.cc @@ -57,7 +57,7 @@ class AutofillDialogViewsTest : public TestWithBrowserView { view_delegate_.SetProfile(profile()); - AddTab(browser(), GURL(content::kAboutBlankURL)); + AddTab(browser(), GURL(url::kAboutBlankURL)); TabStripModel* tab_strip_model = browser()->tab_strip_model(); content::WebContents* contents = tab_strip_model->GetWebContentsAt(0); ASSERT_TRUE(contents); diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc index 1a81634..b7b7863 100644 --- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc @@ -158,7 +158,7 @@ void UserImageScreenHandler::HandleGetImages() { if (screen_->selected_image() != User::kInvalidImageIndex) SelectImage(screen_->selected_image()); - if (screen_->profile_picture_data_url() != content::kAboutBlankURL) + if (screen_->profile_picture_data_url() != url::kAboutBlankURL) SendProfileImage(screen_->profile_picture_data_url()); else if (screen_->profile_picture_absent()) OnProfileImageAbsent(); diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 0a778c0..b68586b 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc @@ -283,11 +283,11 @@ void InspectUI::InspectBrowserWithCustomFrontend( WebContents* inspect_ui = web_ui()->GetWebContents(); WebContents* front_end = inspect_ui->GetDelegate()->OpenURLFromTab( inspect_ui, - content::OpenURLParams(GURL(content::kAboutBlankURL), - content::Referrer(), - NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_AUTO_TOPLEVEL, - false)); + content::OpenURLParams(GURL(url::kAboutBlankURL), + content::Referrer(), + NEW_FOREGROUND_TAB, + content::PAGE_TRANSITION_AUTO_TOPLEVEL, + false)); // Install devtools bindings. DevToolsUIBindings* bindings = new DevToolsUIBindings(front_end, diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index c4e13af..65b0f81 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -75,7 +75,7 @@ const char kProfileDownloadReason[] = "Preferences"; } // namespace ChangePictureOptionsHandler::ChangePictureOptionsHandler() - : previous_image_url_(content::kAboutBlankURL), + : previous_image_url_(url::kAboutBlankURL), previous_image_index_(User::kInvalidImageIndex) { registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED, content::NotificationService::AllSources()); diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc index 767db59..10d8257 100644 --- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc @@ -79,8 +79,12 @@ TEST_F(WebDialogWebContentsDelegateTest, DoNothingMethodsTest) { TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) { test_web_contents_delegate_->OpenURLFromTab( - NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); + NULL, + OpenURLParams(GURL(url::kAboutBlankURL), + Referrer(), + NEW_FOREGROUND_TAB, + content::PAGE_TRANSITION_LINK, + false)); // This should create a new foreground tab in the existing browser. EXPECT_EQ(1, browser()->tab_strip_model()->count()); EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); @@ -102,8 +106,12 @@ TEST_F(WebDialogWebContentsDelegateTest, DetachTest) { EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context()); // Now, none of the following calls should do anything. test_web_contents_delegate_->OpenURLFromTab( - NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), - NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); + NULL, + OpenURLParams(GURL(url::kAboutBlankURL), + Referrer(), + NEW_FOREGROUND_TAB, + content::PAGE_TRANSITION_LINK, + false)); test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL); EXPECT_EQ(0, browser()->tab_strip_model()->count()); diff --git a/chrome/common/net/url_fixer_upper.cc b/chrome/common/net/url_fixer_upper.cc index d5016cd..8d330fa 100644 --- a/chrome/common/net/url_fixer_upper.cc +++ b/chrome/common/net/url_fixer_upper.cc @@ -429,12 +429,11 @@ std::string SegmentURLInternal(std::string* text, url::Parsed* parts) { } // Proceed with about and chrome schemes, but not file or nonstandard schemes. - if ((scheme != content::kAboutScheme) && - (scheme != content::kChromeUIScheme) && + if ((scheme != url::kAboutScheme) && (scheme != content::kChromeUIScheme) && ((scheme == url::kFileScheme) || - !url::IsStandard(scheme.c_str(), - url::Component(0, - static_cast<int>(scheme.length()))))) { + !url::IsStandard( + scheme.c_str(), + url::Component(0, static_cast<int>(scheme.length()))))) { return scheme; } @@ -535,9 +534,9 @@ GURL URLFixerUpper::FixupURL(const std::string& text, } // Parse and rebuild about: and chrome: URLs, except about:blank. - bool chrome_url = !LowerCaseEqualsASCII(trimmed, content::kAboutBlankURL) && - ((scheme == content::kAboutScheme) || - (scheme == content::kChromeUIScheme)); + bool chrome_url = + !LowerCaseEqualsASCII(trimmed, url::kAboutBlankURL) && + ((scheme == url::kAboutScheme) || (scheme == content::kChromeUIScheme)); // For some schemes whose layouts we understand, we rebuild it. if (chrome_url || diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 82c0706..d6b2292 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -249,7 +249,7 @@ void InProcessBrowserTest::PrepareTestCommandLine(CommandLine* command_line) { command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests); if (command_line->GetArgs().empty()) - command_line->AppendArg(content::kAboutBlankURL); + command_line->AppendArg(url::kAboutBlankURL); } bool InProcessBrowserTest::CreateUserDataDirectory() { @@ -342,7 +342,8 @@ void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) { content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - chrome::AddSelectedTabWithURL(browser, GURL(content::kAboutBlankURL), + chrome::AddSelectedTabWithURL(browser, + GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_AUTO_TOPLEVEL); observer.Wait(); diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index f8b8f88..5eadf63 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1117,8 +1117,8 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { // Make a new tab to cause the original one to hide, this should trigger the // next phase of the test. - chrome::NavigateParams params(browser(), GURL(content::kAboutBlankURL), - content::PAGE_TRANSITION_LINK); + chrome::NavigateParams params( + browser(), GURL(url::kAboutBlankURL), content::PAGE_TRANSITION_LINK); params.disposition = NEW_FOREGROUND_TAB; ui_test_utils::NavigateToURL(¶ms); diff --git a/chrome/utility/importer/bookmarks_file_importer.cc b/chrome/utility/importer/bookmarks_file_importer.cc index 909798e..f1a51b1 100644 --- a/chrome/utility/importer/bookmarks_file_importer.cc +++ b/chrome/utility/importer/bookmarks_file_importer.cc @@ -40,13 +40,13 @@ bool CanImportURL(const GURL& url) { } // Check if |url| is about:blank. - if (url == GURL(content::kAboutBlankURL)) + if (url == GURL(url::kAboutBlankURL)) return true; // If |url| starts with chrome:// or about:, check if it's one of the URLs // that we support. if (url.SchemeIs(content::kChromeUIScheme) || - url.SchemeIs(content::kAboutScheme)) { + url.SchemeIs(url::kAboutScheme)) { if (url.host() == chrome::kChromeUIUberHost || url.host() == chrome::kChromeUIAboutHost) return true; diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc index 325c4f8..e588217 100644 --- a/components/bookmarks/browser/bookmark_index_unittest.cc +++ b/components/bookmarks/browser/bookmark_index_unittest.cc @@ -368,7 +368,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsURLs) { // Makes sure index is updated when a node is removed. TEST_F(BookmarkIndexTest, Remove) { const char* titles[] = { "a", "b" }; - const char* urls[] = { kAboutBlankURL, kAboutBlankURL }; + const char* urls[] = {kAboutBlankURL, kAboutBlankURL}; AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles)); // Remove the node and make sure we don't get back any results. @@ -379,7 +379,7 @@ TEST_F(BookmarkIndexTest, Remove) { // Makes sure index is updated when a node's title is changed. TEST_F(BookmarkIndexTest, ChangeTitle) { const char* titles[] = { "a", "b" }; - const char* urls[] = { kAboutBlankURL, kAboutBlankURL }; + const char* urls[] = {kAboutBlankURL, kAboutBlankURL}; AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles)); // Remove the node and make sure we don't get back any results. @@ -391,7 +391,7 @@ TEST_F(BookmarkIndexTest, ChangeTitle) { // Makes sure no more than max queries is returned. TEST_F(BookmarkIndexTest, HonorMax) { const char* titles[] = { "abcd", "abcde" }; - const char* urls[] = { kAboutBlankURL, kAboutBlankURL }; + const char* urls[] = {kAboutBlankURL, kAboutBlankURL}; AddBookmarks(titles, urls, ARRAYSIZE_UNSAFE(titles)); std::vector<BookmarkMatch> matches; diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index b380f96..695c96b 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -419,7 +419,7 @@ base::string16 AccessibleChecker::RoleVariantToString( IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, MAYBE(TestBusyAccessibilityTree)) { - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // The initial accessible returned should have state STATE_SYSTEM_BUSY while // the accessibility tree is being requested from the renderer. @@ -463,7 +463,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, EXPECT_NE(parent_dispatch, reinterpret_cast<IDispatch*>(NULL)); // Navigate to another page. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Verify that the IAccessible reference still points to a valid object and // that calls to its methods fail since the tree is no longer valid after diff --git a/content/browser/accessibility/android_hit_testing_browsertest.cc b/content/browser/accessibility/android_hit_testing_browsertest.cc index 2f298fc..1070f6e 100644 --- a/content/browser/accessibility/android_hit_testing_browsertest.cc +++ b/content/browser/accessibility/android_hit_testing_browsertest.cc @@ -39,7 +39,7 @@ class AndroidHitTestingBrowserTest : public ContentBrowserTest { IN_PROC_BROWSER_TEST_F(AndroidHitTestingBrowserTest, HitTestOutsideDocumentBoundsReturnsRoot) { - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Load the page. AccessibilityNotificationWaiter waiter( diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index d54d0e6..d373f7b 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -135,7 +135,7 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest { void DumpAccessibilityTreeTest::RunTest( const base::FilePath::CharType* file_path) { - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Setup test paths. base::FilePath dir_test_data; diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc index e67b517..1b7050f 100644 --- a/content/browser/browser_url_handler_impl.cc +++ b/content/browser/browser_url_handler_impl.cc @@ -50,7 +50,7 @@ static bool HandleViewSource(GURL* url, BrowserContext* browser_context) { } if (!is_sub_scheme_allowed) { - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); return false; } diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index 363bca3..68f4e81 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc @@ -316,7 +316,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() { RegisterWebSafeScheme(url::kFileSystemScheme); // We know about the following pseudo schemes and treat them specially. - RegisterPseudoScheme(kAboutScheme); + RegisterPseudoScheme(url::kAboutScheme); RegisterPseudoScheme(url::kJavaScriptScheme); RegisterPseudoScheme(kViewSourceScheme); } @@ -617,7 +617,7 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL( return CanRequestURL(child_id, child_url); } - if (LowerCaseEqualsASCII(url.spec(), kAboutBlankURL)) + if (LowerCaseEqualsASCII(url.spec(), url::kAboutBlankURL)) return true; // Every child process can request <about:blank>. // URLs like <about:memory> and <about:crash> shouldn't be requestable by diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index f25adfc..97c1889 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -138,7 +138,7 @@ TEST_F(ChildProcessSecurityPolicyTest, IsPseudoSchemeTest) { ChildProcessSecurityPolicyImpl* p = ChildProcessSecurityPolicyImpl::GetInstance(); - EXPECT_TRUE(p->IsPseudoScheme(kAboutScheme)); + EXPECT_TRUE(p->IsPseudoScheme(url::kAboutScheme)); EXPECT_TRUE(p->IsPseudoScheme(url::kJavaScriptScheme)); EXPECT_TRUE(p->IsPseudoScheme(kViewSourceScheme)); diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index 113c2e5..1b9da1d 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -486,7 +486,7 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI( GURL url(net::UnescapeURLComponent( query, net::UnescapeRule::URL_SPECIAL_CHARS)); if (!url.is_valid()) - url = GURL(kAboutBlankURL); + url = GURL(url::kAboutBlankURL); scoped_ptr<DevToolsTarget> target(delegate_->CreateNewTarget(url)); if (!target) { SendJson(connection_id, diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc index 6bb3d0e..956288c 100644 --- a/content/browser/frame_host/navigation_controller_impl_unittest.cc +++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc @@ -541,7 +541,7 @@ TEST_F(NavigationControllerTest, LoadURLWithExtraParams_Data) { GURL("data:text/html,dataurl")); load_params.load_type = NavigationController::LOAD_TYPE_DATA; load_params.base_url_for_data_url = GURL("http://foo"); - load_params.virtual_url_for_data_url = GURL(kAboutBlankURL); + load_params.virtual_url_for_data_url = GURL(url::kAboutBlankURL); load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE; controller.LoadURLWithParams(load_params); @@ -917,7 +917,7 @@ TEST_F(NavigationControllerTest, LoadURL_IgnorePreemptsPending) { contents()->SetDelegate(delegate.get()); // Without any navigations, the renderer starts at about:blank. - const GURL kExistingURL(kAboutBlankURL); + const GURL kExistingURL(url::kAboutBlankURL); // Now make a pending new navigation. const GURL kNewURL("http://eh"); diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc index ef1f3c1..a6b00f7 100644 --- a/content/browser/frame_host/navigator_impl.cc +++ b/content/browser/frame_host/navigator_impl.cc @@ -543,7 +543,7 @@ void NavigatorImpl::DidNavigate( bool NavigatorImpl::ShouldAssignSiteForURL(const GURL& url) { // about:blank should not "use up" a new SiteInstance. The SiteInstance can // still be used for a normal web site. - if (url == GURL(kAboutBlankURL)) + if (url == GURL(url::kAboutBlankURL)) return false; // The embedder will then have the opportunity to determine if the URL @@ -596,7 +596,7 @@ void NavigatorImpl::RequestTransferURL( GetSiteInstance(); if (!GetContentClient()->browser()->ShouldAllowOpenURL( current_site_instance, url)) { - dest_url = GURL(kAboutBlankURL); + dest_url = GURL(url::kAboutBlankURL); } int64 frame_tree_node_id = -1; diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index f883a45..707e69a 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -457,7 +457,7 @@ void RenderFrameHostImpl::OnNavigate(const IPC::Message& msg) { // should be killed. if (!CanCommitURL(validated_params.url)) { VLOG(1) << "Blocked URL " << validated_params.url.spec(); - validated_params.url = GURL(kAboutBlankURL); + validated_params.url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("CanCommitURL_BlockedAndKilled")); // Kills the process. process->ReceivedBadMessage(); diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc index 5199ab4..ad2689e 100644 --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc @@ -999,7 +999,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, // renderer. IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, MAYBE_BackForwardNotStale) { StartServer(); - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Visit a page on first site. NavigateToURL(shell(), test_server()->GetURL("files/title1.html")); diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 2fb57de..00b9471 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc @@ -584,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) { // Start on a different URL to force a new renderer process. Shell* new_shell = CreateBrowser(); - NavigateToURL(new_shell, GURL(kAboutBlankURL)); + NavigateToURL(new_shell, GURL(url::kAboutBlankURL)); NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2", "setVersion(3) blocked"); diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index 9836d04..0858bd6 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -248,7 +248,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, // Navigate to a cross-site page that loads immediately without making a // network request. The unload event should still be run. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Check that the cookie was set. EXPECT_EQ("onunloadCookie=foo", GetCookies(url)); diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index 254a744..bdd7709 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc @@ -201,7 +201,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { // Covers tear-down when navigating away as opposed to browser exiting. IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { PlayVideo("bear.ogv", false); - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); EXPECT_FALSE(shell()->web_contents()->IsCrashed()); } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 81d8cc9..66cbbcf 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1654,15 +1654,15 @@ void RenderProcessHostImpl::FilterURL(RenderProcessHost* rph, // This is because the browser treats navigation to an empty GURL as a // navigation to the home page. This is often a privileged page // (chrome://newtab/) which is exactly what we don't want. - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_Invalid")); return; } - if (url->SchemeIs(kAboutScheme)) { + if (url->SchemeIs(url::kAboutScheme)) { // The renderer treats all URLs in the about: scheme as being about:blank. // Canonicalize about: URLs to about:blank. - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_About")); } @@ -1676,7 +1676,7 @@ void RenderProcessHostImpl::FilterURL(RenderProcessHost* rph, // URL. This prevents us from storing the blocked URL and becoming confused // later. VLOG(1) << "Blocked URL " << url->spec(); - *url = GURL(kAboutBlankURL); + *url = GURL(url::kAboutBlankURL); RecordAction(base::UserMetricsAction("FilterURLTermiate_Blocked")); } } diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 15fa110..6889cd6f 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -63,7 +63,8 @@ class RenderViewHostTest : public RenderViewHostImplTestHarness { TEST_F(RenderViewHostTest, FilterAbout) { test_rvh()->SendNavigate(1, GURL("about:cache")); ASSERT_TRUE(controller().GetVisibleEntry()); - EXPECT_EQ(GURL(kAboutBlankURL), controller().GetVisibleEntry()->GetURL()); + EXPECT_EQ(GURL(url::kAboutBlankURL), + controller().GetVisibleEntry()->GetURL()); } // Create a full screen popup RenderWidgetHost and View. @@ -152,8 +153,8 @@ TEST_F(RenderViewHostTest, StartDragging) { drop_data.url = file_url; drop_data.html_base_url = file_url; test_rvh()->TestOnStartDragging(drop_data); - EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.drag_url()); - EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.html_base_url()); + EXPECT_EQ(GURL(url::kAboutBlankURL), delegate_view.drag_url()); + EXPECT_EQ(GURL(url::kAboutBlankURL), delegate_view.html_base_url()); GURL http_url = GURL("http://www.domain.com/index.html"); drop_data.url = http_url; diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index c4054b4..4465510 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -52,7 +52,7 @@ class SessionHistoryTest : public ContentBrowserTest { embedded_test_server()->RegisterRequestHandler( base::Bind(&HandleEchoTitleRequest, "/echotitle")); - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); } // Simulate clicking a link. Only works on the frames.html testserver page. @@ -164,10 +164,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, BasicBackForward) { EXPECT_EQ("bot1", GetTabTitle()); GoBack(); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); ASSERT_FALSE(CanGoBack()); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); GoForward(); EXPECT_EQ("bot1", GetTabTitle()); @@ -203,8 +203,8 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameBackForward) { EXPECT_EQ(frames, GetTabURL()); GoBack(); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); - EXPECT_EQ(GURL(kAboutBlankURL), GetTabURL()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(GURL(url::kAboutBlankURL), GetTabURL()); GoForward(); EXPECT_EQ("bot1", GetTabTitle()); @@ -400,10 +400,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, JavascriptHistory) { // history is [blank, bot1, bot2, *bot3] JavascriptGo("-3"); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); ASSERT_FALSE(CanGoBack()); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); JavascriptGo("1"); EXPECT_EQ("bot1", GetTabTitle()); @@ -419,10 +419,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, JavascriptHistory) { EXPECT_EQ("bot1", GetTabTitle()); JavascriptGo("-1"); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); ASSERT_FALSE(CanGoBack()); - EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle()); + EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle()); JavascriptGo("1"); EXPECT_EQ("bot1", GetTabTitle()); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 13b921f..ee24b6f 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2265,7 +2265,7 @@ void WebContentsImpl::InsertCSS(const std::string& css) { bool WebContentsImpl::FocusLocationBarByDefault() { NavigationEntry* entry = controller_.GetVisibleEntry(); - if (entry && entry->GetURL() == GURL(kAboutBlankURL)) + if (entry && entry->GetURL() == GURL(url::kAboutBlankURL)) return true; return delegate_ && delegate_->ShouldFocusLocationBarByDefault(this); } diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index 363a9b0..b487a16 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc @@ -325,7 +325,8 @@ TEST_F(WebContentsImplTest, UpdateTitle) { NavigationControllerImpl& cont = static_cast<NavigationControllerImpl&>(controller()); FrameHostMsg_DidCommitProvisionalLoad_Params params; - InitNavigateParams(¶ms, 0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); + InitNavigateParams( + ¶ms, 0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); LoadCommittedDetails details; cont.RendererDidNavigate(main_test_rfh(), params, &details); @@ -1232,7 +1233,7 @@ TEST_F(WebContentsImplTest, NavigationEntryContentStateNewWindow) { // When opening a new window, it is navigated to about:blank internally. // Currently, this results in two DidNavigate events. - const GURL url(kAboutBlankURL); + const GURL url(url::kAboutBlankURL); contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED); contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED); @@ -2297,7 +2298,7 @@ TEST_F(WebContentsImplTest, FilterURLs) { // A navigation to about:whatever should always look like a navigation to // about:blank - GURL url_normalized(kAboutBlankURL); + GURL url_normalized(url::kAboutBlankURL); GURL url_from_ipc("about:whatever"); // We navigate the test WebContents to about:blank, since NavigateAndCommit diff --git a/content/browser/webui/web_ui_controller_factory_registry.cc b/content/browser/webui/web_ui_controller_factory_registry.cc index a933ecd..a80f52b 100644 --- a/content/browser/webui/web_ui_controller_factory_registry.cc +++ b/content/browser/webui/web_ui_controller_factory_registry.cc @@ -83,7 +83,7 @@ bool WebUIControllerFactoryRegistry::IsURLAcceptableForWebUI( return UseWebUIForURL(browser_context, url) || // It's possible to load about:blank in a Web UI renderer. // See http://crbug.com/42547 - url.spec() == kAboutBlankURL || + url.spec() == url::kAboutBlankURL || // javascript: and debug URLs like chrome://kill are allowed. IsRendererDebugURL(url); } diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index f22be90..a19b8b1 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -6,8 +6,6 @@ namespace content { -const char kAboutScheme[] = "about"; - // Before adding new chrome schemes please check with security@chromium.org. // There are security implications associated with introducing new schemes. const char kChromeDevToolsScheme[] = "chrome-devtools"; @@ -17,7 +15,6 @@ const char kMetadataScheme[] = "metadata"; const char kSwappedOutScheme[] = "swappedout"; const char kViewSourceScheme[] = "view-source"; -const char kAboutBlankURL[] = "about:blank"; const char kAboutSrcDocURL[] = "about:srcdoc"; const char kChromeUIAppCacheInternalsHost[] = "appcache-internals"; diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index bb6fe97..d1d0ddc 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -15,7 +15,6 @@ namespace content { // Canonical schemes you can use as input to GURL.SchemeIs(). // TODO(jam): some of these don't below in the content layer, but are accessed // from there. -CONTENT_EXPORT extern const char kAboutScheme[]; CONTENT_EXPORT extern const char kChromeDevToolsScheme[]; CONTENT_EXPORT extern const char kChromeUIScheme[]; // Used for WebUIs. CONTENT_EXPORT extern const char kGuestScheme[]; @@ -24,7 +23,6 @@ CONTENT_EXPORT extern const char kSwappedOutScheme[]; CONTENT_EXPORT extern const char kViewSourceScheme[]; // Hosts for about URLs. -CONTENT_EXPORT extern const char kAboutBlankURL[]; CONTENT_EXPORT extern const char kAboutSrcDocURL[]; CONTENT_EXPORT extern const char kChromeUIAccessibilityHost[]; diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc index 29c8815..73fc7ca 100644 --- a/content/public/test/content_browser_test.cc +++ b/content/public/test/content_browser_test.cc @@ -157,7 +157,7 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() { Shell* ContentBrowserTest::CreateBrowser() { return Shell::CreateNewWindow( ShellContentBrowserClient::Get()->browser_context(), - GURL(kAboutBlankURL), + GURL(url::kAboutBlankURL), NULL, MSG_ROUTING_NONE, gfx::Size()); @@ -166,7 +166,7 @@ Shell* ContentBrowserTest::CreateBrowser() { Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { return Shell::CreateNewWindow( ShellContentBrowserClient::Get()->off_the_record_browser_context(), - GURL(kAboutBlankURL), + GURL(url::kAboutBlankURL), NULL, MSG_ROUTING_NONE, gfx::Size()); diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 1866bb8..d167078 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -200,7 +200,7 @@ WebURLResponseExtraDataImpl* GetExtraDataFromResponse( void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) { // Replace any occurrences of swappedout:// with about:blank. - const WebURL& blank_url = GURL(kAboutBlankURL); + const WebURL& blank_url = GURL(url::kAboutBlankURL); WebVector<WebURL> urls; ds->redirectChain(urls); result->reserve(urls.size()); @@ -2042,7 +2042,7 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) { // Notify the browser about non-blank documents loading in the top frame. GURL url = frame->document().url(); - if (url.is_valid() && url.spec() != kAboutBlankURL) { + if (url.is_valid() && url.spec() != url::kAboutBlankURL) { // TODO(nasko): Check if webview()->mainFrame() is the same as the // frame->tree()->top(). blink::WebFrame* main_frame = render_view_->webview()->mainFrame(); @@ -3265,7 +3265,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( // browser process, and issue a special POST navigation in WebKit (via // FrameLoader::loadFrameRequest). See ResourceDispatcher and WebURLLoaderImpl // for examples of how to send the httpBody data. - if (!frame->parent() && is_content_initiated && !url.SchemeIs(kAboutScheme)) { + if (!frame->parent() && is_content_initiated && + !url.SchemeIs(url::kAboutScheme)) { bool send_referrer = false; // All navigations to or from WebUI URLs or within WebUI-enabled @@ -3325,7 +3326,7 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( // (see below). bool is_fork = // Must start from a tab showing about:blank, which is later redirected. - old_url == GURL(kAboutBlankURL) && + old_url == GURL(url::kAboutBlankURL) && // Must be the first real navigation of the tab. render_view_->historyBackListCount() < 1 && render_view_->historyForwardListCount() < 1 && diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index 4769183..2919f58 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -288,7 +288,7 @@ class ResourceFetcherTests : public ContentBrowserTest { // If this flakes, use http://crbug.com/51622. IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherDownload) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); ASSERT_TRUE(test_server()->Start()); GURL url(test_server()->GetURL("files/simple_page.html")); @@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherDownload) { IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcher404) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Test 404 response. ASSERT_TRUE(test_server()->Start()); @@ -314,7 +314,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcher404) { // If this flakes, use http://crbug.com/51622. IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); PostTaskToInProcessRendererAndWait( base::Bind(&ResourceFetcherTests::ResourceFetcherDidFailOnRenderer, @@ -323,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) { IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherTimeout) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Grab a page that takes at least 1 sec to respond, but set the fetcher to // timeout in 0 sec. @@ -338,7 +338,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherTimeout) { IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherDeletedInCallback) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Grab a page that takes at least 1 sec to respond, but set the fetcher to // timeout in 0 sec. @@ -356,7 +356,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, // Test that ResourceFetchers can handle POSTs. IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherPost) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Grab a page that echos the POST body. ASSERT_TRUE(test_server()->Start()); @@ -371,7 +371,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherPost) { // Test that ResourceFetchers can set headers. IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, MAYBE_ResourceFetcherSetHeader) { // Need to spin up the renderer. - NavigateToURL(shell(), GURL(kAboutBlankURL)); + NavigateToURL(shell(), GURL(url::kAboutBlankURL)); // Grab a page that echos the POST body. ASSERT_TRUE(test_server()->Start()); diff --git a/content/shell/browser/shell_application_mac.mm b/content/shell/browser/shell_application_mac.mm index e18df5b..e665d8b 100644 --- a/content/shell/browser/shell_application_mac.mm +++ b/content/shell/browser/shell_application_mac.mm @@ -30,7 +30,7 @@ content::ShellBrowserContext* browserContext = content::ShellContentBrowserClient::Get()->browser_context(); content::Shell::CreateNewWindow(browserContext, - GURL(content::kAboutBlankURL), + GURL(url::kAboutBlankURL), NULL, MSG_ROUTING_NONE, gfx::Size()); diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 9c069d0..b251935 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -151,7 +151,7 @@ class NavigateAwayVisitor : public RenderViewVisitor { if (render_view == main_render_view_) return true; render_view->GetWebView()->mainFrame()->loadRequest( - WebURLRequest(GURL(kAboutBlankURL))); + WebURLRequest(GURL(url::kAboutBlankURL))); return true; } @@ -706,7 +706,7 @@ void WebKitTestRunner::OnReset() { // Navigating to about:blank will make sure that no new loads are initiated // by the renderer. render_view()->GetWebView()->mainFrame()->loadRequest( - WebURLRequest(GURL(kAboutBlankURL))); + WebURLRequest(GURL(url::kAboutBlankURL))); Send(new ShellViewHostMsg_ResetDone(routing_id())); } @@ -718,7 +718,7 @@ void WebKitTestRunner::OnNotifyDone() { void WebKitTestRunner::OnTryLeakDetection() { WebLocalFrame* main_frame = render_view()->GetWebView()->mainFrame()->toWebLocalFrame(); - DCHECK_EQ(GURL(kAboutBlankURL), GURL(main_frame->document().url())); + DCHECK_EQ(GURL(url::kAboutBlankURL), GURL(main_frame->document().url())); DCHECK(!main_frame->isLoading()); leak_detector_->TryLeakDetection(main_frame); diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc index dc7a7f8..ba0331c 100644 --- a/content/test/accessibility_browser_test_utils.cc +++ b/content/test/accessibility_browser_test_utils.cc @@ -80,7 +80,7 @@ bool AccessibilityNotificationWaiter::IsAboutBlank() { if (root.string_attributes[i].first != ui::AX_ATTR_DOC_URL) continue; const std::string& doc_url = root.string_attributes[i].second; - return doc_url == kAboutBlankURL; + return doc_url == url::kAboutBlankURL; } return false; } diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc index 2a2e6f0..b4eeefd 100644 --- a/extensions/renderer/script_context.cc +++ b/extensions/renderer/script_context.cc @@ -172,7 +172,7 @@ GURL ScriptContext::GetEffectiveDocumentURL(const blink::WebFrame* frame, // Common scenario. If |match_about_blank| is false (as is the case in most // extensions), or if the frame is not an about:-page, just return // |document_url| (supposedly the URL of the frame). - if (!match_about_blank || !document_url.SchemeIs(content::kAboutScheme)) + if (!match_about_blank || !document_url.SchemeIs(url::kAboutScheme)) return document_url; // Non-sandboxed about:blank and about:srcdoc pages inherit their security @@ -182,7 +182,7 @@ GURL ScriptContext::GetEffectiveDocumentURL(const blink::WebFrame* frame, do { parent = parent->parent() ? parent->parent() : parent->opener(); } while (parent != NULL && - GURL(parent->document().url()).SchemeIs(content::kAboutScheme)); + GURL(parent->document().url()).SchemeIs(url::kAboutScheme)); if (parent) { // Only return the parent URL if the frame can access it. diff --git a/url/url_constants.cc b/url/url_constants.cc index 7eac658..d5c57f4 100644 --- a/url/url_constants.cc +++ b/url/url_constants.cc @@ -6,6 +6,9 @@ namespace url { +const char kAboutBlankURL[] = "about:blank"; + +const char kAboutScheme[] = "about"; const char kBlobScheme[] = "blob"; const char kDataScheme[] = "data"; const char kFileScheme[] = "file"; diff --git a/url/url_constants.h b/url/url_constants.h index 055208a..c2f163a 100644 --- a/url/url_constants.h +++ b/url/url_constants.h @@ -9,6 +9,9 @@ namespace url { +URL_EXPORT extern const char kAboutBlankURL[]; + +URL_EXPORT extern const char kAboutScheme[]; URL_EXPORT extern const char kBlobScheme[]; URL_EXPORT extern const char kDataScheme[]; URL_EXPORT extern const char kFileScheme[]; |