| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index d0dff8f8494a594d1a825fe7bf434d33667323b0..094aec15d9978df549e0dd7c74cb5f4c62c2d82f 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -1109,7 +1109,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) {
|
| FILE_PATH_LITERAL("empty.html");
|
| GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
|
| base::FilePath::kCurrentDirectory), base::FilePath(kEmptyFile)));
|
| - ASSERT_TRUE(file_url.SchemeIs(content::kFileScheme));
|
| + ASSERT_TRUE(file_url.SchemeIs(url::kFileScheme));
|
| ui_test_utils::NavigateToURL(browser(), file_url);
|
| EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| }
|
| @@ -1148,7 +1148,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
|
| base::FilePath(kDocRoot));
|
| ASSERT_TRUE(test_server.Start());
|
| GURL ftp_url(test_server.GetURL(std::string()));
|
| - ASSERT_TRUE(ftp_url.SchemeIs(content::kFtpScheme));
|
| + ASSERT_TRUE(ftp_url.SchemeIs(url::kFtpScheme));
|
| ui_test_utils::NavigateToURL(browser(), ftp_url);
|
| EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| }
|
| @@ -1254,7 +1254,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) {
|
| FILE_PATH_LITERAL("onload_change_favicon.html");
|
| GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
|
| base::FilePath::kCurrentDirectory), base::FilePath(kFile)));
|
| - ASSERT_TRUE(file_url.SchemeIs(content::kFileScheme));
|
| + ASSERT_TRUE(file_url.SchemeIs(url::kFileScheme));
|
| ui_test_utils::NavigateToURL(browser(), file_url);
|
|
|
| NavigationEntry* entry = browser()->tab_strip_model()->
|
|
|