Index: chrome/browser/browsing_data/browsing_data_helper_unittest.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc |
index 5e3dd801a1e7212aa4a476803c412d7645436e79..f39c4a926a798d773b0a4e02812769b1d50e4fb6 100644 |
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc |
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc |
@@ -7,10 +7,10 @@ |
#include "base/strings/stringprintf.h" |
#include "chrome/browser/extensions/mock_extension_special_storage_policy.h" |
#include "chrome/common/url_constants.h" |
-#include "content/public/common/url_constants.h" |
#include "extensions/common/constants.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "url/gurl.h" |
+#include "url/url_constants.h" |
namespace { |
@@ -60,11 +60,11 @@ class BrowsingDataHelperTest : public testing::Test { |
TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) { |
EXPECT_TRUE(IsWebScheme(url::kHttpScheme)); |
EXPECT_TRUE(IsWebScheme(url::kHttpsScheme)); |
- EXPECT_TRUE(IsWebScheme(content::kFtpScheme)); |
- EXPECT_TRUE(IsWebScheme(content::kDataScheme)); |
+ EXPECT_TRUE(IsWebScheme(url::kFtpScheme)); |
+ EXPECT_TRUE(IsWebScheme(url::kDataScheme)); |
EXPECT_TRUE(IsWebScheme("feed")); |
- EXPECT_TRUE(IsWebScheme(content::kBlobScheme)); |
- EXPECT_TRUE(IsWebScheme(content::kFileSystemScheme)); |
+ EXPECT_TRUE(IsWebScheme(url::kBlobScheme)); |
+ EXPECT_TRUE(IsWebScheme(url::kFileSystemScheme)); |
EXPECT_FALSE(IsWebScheme("invalid-scheme-i-just-made-up")); |
} |
@@ -73,8 +73,8 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) { |
EXPECT_FALSE(IsWebScheme(content::kAboutScheme)); |
EXPECT_FALSE(IsWebScheme(content::kChromeDevToolsScheme)); |
EXPECT_FALSE(IsWebScheme(content::kChromeUIScheme)); |
- EXPECT_FALSE(IsWebScheme(content::kJavaScriptScheme)); |
- EXPECT_FALSE(IsWebScheme(content::kMailToScheme)); |
+ EXPECT_FALSE(IsWebScheme(url::kJavaScriptScheme)); |
+ EXPECT_FALSE(IsWebScheme(url::kMailToScheme)); |
EXPECT_FALSE(IsWebScheme(content::kMetadataScheme)); |
EXPECT_FALSE(IsWebScheme(content::kSwappedOutScheme)); |
EXPECT_FALSE(IsWebScheme(content::kViewSourceScheme)); |
@@ -83,11 +83,11 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) { |
TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) { |
EXPECT_FALSE(IsExtensionScheme(url::kHttpScheme)); |
EXPECT_FALSE(IsExtensionScheme(url::kHttpsScheme)); |
- EXPECT_FALSE(IsExtensionScheme(content::kFtpScheme)); |
- EXPECT_FALSE(IsExtensionScheme(content::kDataScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kFtpScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kDataScheme)); |
EXPECT_FALSE(IsExtensionScheme("feed")); |
- EXPECT_FALSE(IsExtensionScheme(content::kBlobScheme)); |
- EXPECT_FALSE(IsExtensionScheme(content::kFileSystemScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kBlobScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kFileSystemScheme)); |
EXPECT_FALSE(IsExtensionScheme("invalid-scheme-i-just-made-up")); |
} |
@@ -97,8 +97,8 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) { |
EXPECT_FALSE(IsExtensionScheme(content::kAboutScheme)); |
EXPECT_FALSE(IsExtensionScheme(content::kChromeDevToolsScheme)); |
EXPECT_FALSE(IsExtensionScheme(content::kChromeUIScheme)); |
- EXPECT_FALSE(IsExtensionScheme(content::kJavaScriptScheme)); |
- EXPECT_FALSE(IsExtensionScheme(content::kMailToScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kJavaScriptScheme)); |
+ EXPECT_FALSE(IsExtensionScheme(url::kMailToScheme)); |
EXPECT_FALSE(IsExtensionScheme(content::kMetadataScheme)); |
EXPECT_FALSE(IsExtensionScheme(content::kSwappedOutScheme)); |
EXPECT_FALSE(IsExtensionScheme(content::kViewSourceScheme)); |