Renaming `BrowsingDataHelper::IsValidScheme`, as it's poorly descriptive.

chrome/browser/browsing_data_helper_unittest.cc

Index: chrome/browser/browsing_data_helper_unittest.cc
diff --git a/chrome/browser/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data_helper_unittest.cc
index a074d2b21fc36cc3d86298f6f4ff7e4d412ac664..68ce6bd192edb066b899fb8cb38b98f9102db050 100644
--- a/chrome/browser/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data_helper_unittest.cc
@@ -18,11 +18,19 @@ class BrowsingDataHelperTest : public testing::Test {
   BrowsingDataHelperTest() {}
   virtual ~BrowsingDataHelperTest() {}
 
-  bool IsValidScheme(const std::string& scheme) {
+  bool IsWebScheme(const std::string& scheme) {
     GURL test(scheme + "://example.com");
-    return (BrowsingDataHelper::HasValidScheme(test) &&
-            BrowsingDataHelper::IsValidScheme(scheme) &&
-            BrowsingDataHelper::IsValidScheme(
+    return (BrowsingDataHelper::HasWebScheme(test) &&
+            BrowsingDataHelper::IsWebScheme(scheme) &&
+            BrowsingDataHelper::IsWebScheme(
+                WebKit::WebString::fromUTF8(scheme)));
+  }
+
+  bool IsExtensionScheme(const std::string& scheme) {
+    GURL test(scheme + "://example.com");
+    return (BrowsingDataHelper::HasExtensionScheme(test) &&
+            BrowsingDataHelper::IsExtensionScheme(scheme) &&
+            BrowsingDataHelper::IsExtensionScheme(
                 WebKit::WebString::fromUTF8(scheme)));
   }
 
@@ -30,29 +38,53 @@ class BrowsingDataHelperTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataHelperTest);
 };
 
-TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreValid) {
-  EXPECT_TRUE(IsValidScheme(chrome::kHttpScheme));
-  EXPECT_TRUE(IsValidScheme(chrome::kHttpsScheme));
-  EXPECT_TRUE(IsValidScheme(chrome::kFtpScheme));
-  EXPECT_TRUE(IsValidScheme(chrome::kDataScheme));
-  EXPECT_TRUE(IsValidScheme("feed"));
-  EXPECT_TRUE(IsValidScheme(chrome::kBlobScheme));
-  EXPECT_TRUE(IsValidScheme(chrome::kFileSystemScheme));
+TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) {
+  EXPECT_TRUE(IsWebScheme(chrome::kHttpScheme));
+  EXPECT_TRUE(IsWebScheme(chrome::kHttpsScheme));
+  EXPECT_TRUE(IsWebScheme(chrome::kFtpScheme));
+  EXPECT_TRUE(IsWebScheme(chrome::kDataScheme));
+  EXPECT_TRUE(IsWebScheme("feed"));
+  EXPECT_TRUE(IsWebScheme(chrome::kBlobScheme));
+  EXPECT_TRUE(IsWebScheme(chrome::kFileSystemScheme));
+  EXPECT_FALSE(IsWebScheme("invalid-scheme-i-just-made-up"));
+}
+
+TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) {
+  EXPECT_FALSE(IsWebScheme(chrome::kExtensionScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kAboutScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kChromeDevToolsScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kChromeInternalScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kChromeUIScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kJavaScriptScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kMailToScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kMetadataScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kSwappedOutScheme));
+  EXPECT_FALSE(IsWebScheme(chrome::kViewSourceScheme));
+}
 
-  EXPECT_FALSE(IsValidScheme("invalid-scheme-i-just-made-up"));
+TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) {
+  EXPECT_FALSE(IsExtensionScheme(chrome::kHttpScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kHttpsScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kFtpScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kDataScheme));
+  EXPECT_FALSE(IsExtensionScheme("feed"));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kBlobScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kFileSystemScheme));
+  EXPECT_FALSE(IsExtensionScheme("invalid-scheme-i-just-made-up"));
 }
 
-TEST_F(BrowsingDataHelperTest, ChromeSchemesAreInvalid) {
-  EXPECT_FALSE(IsValidScheme(chrome::kExtensionScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kAboutScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kChromeDevToolsScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kChromeInternalScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kChromeUIScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kJavaScriptScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kMailToScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kMetadataScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kSwappedOutScheme));
-  EXPECT_FALSE(IsValidScheme(chrome::kViewSourceScheme));
+TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) {
+  EXPECT_TRUE(IsExtensionScheme(chrome::kExtensionScheme));
+
+  EXPECT_FALSE(IsExtensionScheme(chrome::kAboutScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kChromeDevToolsScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kChromeInternalScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kChromeUIScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kJavaScriptScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kMailToScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kMetadataScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kSwappedOutScheme));
+  EXPECT_FALSE(IsExtensionScheme(chrome::kViewSourceScheme));
 }
 
 }  // namespace