chrome/browser/ui/browser_browsertest.cc - Issue 254763005: Move some content url constants to /url.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/app_list/search/common/webservice_search_provider.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_browsertest.cc

diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc

index ccfe5fac481dd3be957556dfc59d44d2155f0a6d..89015cb2e37508cd6654d964f614c731892f1bab 100644

--- a/chrome/browser/ui/browser_browsertest.cc

+++ b/chrome/browser/ui/browser_browsertest.cc

@@ -204,7 +204,7 @@ class TransferHttpsRedirectsContentBrowserClient

content::ResourceContext* resource_context,

const GURL& current_url,

const GURL& new_url) OVERRIDE {

- return new_url.SchemeIs(content::kHttpsScheme);

+ return new_url.SchemeIs(url::kHttpsScheme);

}

};

@@ -1119,7 +1119,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) {

ASSERT_TRUE(test_server()->Start());

GURL http_url(test_server()->GetURL(std::string()));

- ASSERT_TRUE(http_url.SchemeIs(content::kHttpScheme));

+ ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme));

ui_test_utils::NavigateToURL(browser(), http_url);

EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));

}

@@ -1133,7 +1133,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) {

base::FilePath(kDocRoot));

ASSERT_TRUE(test_server.Start());

GURL https_url(test_server.GetURL("/"));

- ASSERT_TRUE(https_url.SchemeIs(content::kHttpsScheme));

+ ASSERT_TRUE(https_url.SchemeIs(url::kHttpsScheme));

ui_test_utils::NavigateToURL(browser(), https_url);

EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));

}

@@ -1179,7 +1179,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {

IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {

ASSERT_TRUE(test_server()->Start());

GURL http_url(test_server()->GetURL(std::string()));

- ASSERT_TRUE(http_url.SchemeIs(content::kHttpScheme));

+ ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme));

ASSERT_EQ(1, browser()->tab_strip_model()->count());

WebContents* initial_tab = browser()->tab_strip_model()->GetWebContentsAt(0);