Move IsValidOriginIdentifier into appropriate header

content/browser/database_util_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "storage/browser/database/database_util.h"
 #include "storage/common/database/database_identifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 11 matching lines @@
   EXPECT_EQ(expected_result,
             DatabaseUtil::CrackVfsFileName(ASCIIToUTF16(vfs_file_name),
                                            &origin_identifier,
                                            &database_name,
                                            &sqlite_suffix));
   EXPECT_EQ(expected_origin_identifier, origin_identifier);
   EXPECT_EQ(ASCIIToUTF16(expected_database_name), database_name);
   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.
 TEST(DatabaseUtilTest, CrackVfsFilePathTest) {
   TestVfsFilePath(true, "http_origin_0/#", "http_origin_0", "", "");
   TestVfsFilePath(true,
       "http_origin_0/#suffix", "http_origin_0", "", "suffix");
   TestVfsFilePath(true,
       "http_origin_0/db_name#", "http_origin_0", "db_name", "");
   TestVfsFilePath(true,
       "http_origin_0/db_name#suffix", "http_origin_0", "db_name", "suffix");
   TestVfsFilePath(false, "http_origin_0db_name#");
   TestVfsFilePath(false, "http_origin_0db_name#suffix");
   TestVfsFilePath(false, "http_origin_0/db_name");
   TestVfsFilePath(false, "http_origin_0#db_name/suffix");
   TestVfsFilePath(false, "/db_name#");
   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