Use chromium logic for database identifier<->origin conversions

webkit/browser/database/database_util_unittest.cc

 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h"
-#include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/database/database_util.h"
+#include "webkit/common/database/database_identifier.h"
 
 using webkit_database::DatabaseUtil;
 
 static void TestVfsFilePath(bool expected_result,
                             const char* vfs_file_name,
                             const char* expected_origin_identifier = "",
                             const char* expected_database_name = "",
                             const char* expected_sqlite_suffix = "") {
   std::string origin_identifier;
   base::string16 database_name;
   base::string16 sqlite_suffix;
   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 = webkit_base::GetOriginIdentifierFromURL(origin_url);
-  return webkit_base::GetOriginURLFromIdentifier(id);
+  std::string id = webkit_database::GetIdentifierFromOrigin(origin_url);
+  return webkit_database::GetOriginFromIdentifier(id);
 }
 
 static void TestValidOriginIdentifier(bool expected_result,
                                       const std::string& id) {
   EXPECT_EQ(expected_result,
             DatabaseUtil::IsValidOriginIdentifier(id));
 }
 
 namespace webkit_database {
 
@@ skipping 21 matching lines @@
 TEST(DatabaseUtilTest, IsValidOriginIdentifier) {
   TestValidOriginIdentifier(true,  "http_bar_0");
   TestValidOriginIdentifier(true,  "");
   TestValidOriginIdentifier(false, "bad..id");
   TestValidOriginIdentifier(false, "bad/id");
   TestValidOriginIdentifier(false, "bad\\id");
   TestValidOriginIdentifier(false, std::string("bad\0id", 6));
 }
 
 }  // namespace webkit_database