Move IsValidOriginIdentifier into appropriate header

content/browser/database_util_unittest.cc

Index: content/browser/database_util_unittest.cc
diff --git a/content/browser/database_util_unittest.cc b/content/browser/database_util_unittest.cc
index 50d68952b4ab3ba1a23a1f0608c64b18e6420d81..9534cb9848808cf95b36061ced250502dbd8c8b4 100644
--- a/content/browser/database_util_unittest.cc
+++ b/content/browser/database_util_unittest.cc
@@ -29,17 +29,6 @@ static void TestVfsFilePath(bool expected_result,
   EXPECT_EQ(ASCIIToUTF16(expected_sqlite_suffix), sqlite_suffix);
 }
 
-static GURL ToAndFromOriginIdentifier(const GURL origin_url) {
-  std::string id = storage::GetIdentifierFromOrigin(origin_url);
-  return storage::GetOriginFromIdentifier(id);
-}
-
-static void TestValidOriginIdentifier(bool expected_result,
-                                      const std::string& id) {
-  EXPECT_EQ(expected_result,
-            DatabaseUtil::IsValidOriginIdentifier(id));
-}
-
 namespace content {
 
 // Test DatabaseUtil::CrackVfsFilePath on various inputs.
@@ -59,21 +48,5 @@ TEST(DatabaseUtilTest, CrackVfsFilePathTest) {
   TestVfsFilePath(false, "/db_name#suffix");
 }
 
-TEST(DatabaseUtilTest, OriginIdentifiers) {
-  const GURL kFileOrigin(GURL("file:///").GetOrigin());
-  const GURL kHttpOrigin(GURL("http://bar/").GetOrigin());
-  EXPECT_EQ(kFileOrigin, ToAndFromOriginIdentifier(kFileOrigin));
-  EXPECT_EQ(kHttpOrigin, ToAndFromOriginIdentifier(kHttpOrigin));
-}
-
-TEST(DatabaseUtilTest, IsValidOriginIdentifier) {
-  TestValidOriginIdentifier(true,  "http_bar_0");
-  TestValidOriginIdentifier(false,  "");
-  TestValidOriginIdentifier(false, "bad..id");
-  TestValidOriginIdentifier(false, "bad/id");
-  TestValidOriginIdentifier(false, "bad\\id");
-  TestValidOriginIdentifier(false, "http_bad:0_2");
-  TestValidOriginIdentifier(false, std::string("bad\0id", 6));
-}
 
 }  // namespace content