Use chromium logic for database identifier<->origin conversions

webkit/browser/database/database_tracker.cc

Index: webkit/browser/database/database_tracker.cc
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index 56dfd2c73e15203604a18cb996940a25906b405c..75a91055bede60443980eaf5cc60889d9bfd77f3 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -20,12 +20,12 @@
 #include "sql/meta_table.h"
 #include "sql/transaction.h"
 #include "third_party/sqlite/sqlite3.h"
-#include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/database/database_quota_client.h"
 #include "webkit/browser/database/database_util.h"
 #include "webkit/browser/database/databases_table.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
+#include "webkit/common/database/database_identifier.h"
 
 namespace webkit_database {
 
@@ -122,7 +122,7 @@ void DatabaseTracker::DatabaseOpened(const std::string& origin_identifier,
   if (quota_manager_proxy_.get())
     quota_manager_proxy_->NotifyStorageAccessed(
         quota::QuotaClient::kDatabase,
-        webkit_base::GetOriginURLFromIdentifier(origin_identifier),
+        webkit_database::GetOriginFromIdentifier(origin_identifier),
         quota::kStorageTypeTemporary);
 
   InsertOrUpdateDatabaseDetails(origin_identifier, database_name,
@@ -157,7 +157,7 @@ void DatabaseTracker::DatabaseClosed(const std::string& origin_identifier,
   if (quota_manager_proxy_.get())
     quota_manager_proxy_->NotifyStorageAccessed(
         quota::QuotaClient::kDatabase,
-        webkit_base::GetOriginURLFromIdentifier(origin_identifier),
+        webkit_database::GetOriginFromIdentifier(origin_identifier),
         quota::kStorageTypeTemporary);
 
   UpdateOpenDatabaseSizeAndNotify(origin_identifier, database_name);
@@ -369,7 +369,7 @@ bool DatabaseTracker::DeleteClosedDatabase(
   if (quota_manager_proxy_.get() && db_file_size)
     quota_manager_proxy_->NotifyStorageModified(
         quota::QuotaClient::kDatabase,
-        webkit_base::GetOriginURLFromIdentifier(origin_identifier),
+        webkit_database::GetOriginFromIdentifier(origin_identifier),
         quota::kStorageTypeTemporary,
         -db_file_size);
 
@@ -429,7 +429,7 @@ bool DatabaseTracker::DeleteOrigin(const std::string& origin_identifier,
   if (quota_manager_proxy_.get() && deleted_size) {
     quota_manager_proxy_->NotifyStorageModified(
         quota::QuotaClient::kDatabase,
-        webkit_base::GetOriginURLFromIdentifier(origin_identifier),
+        webkit_database::GetOriginFromIdentifier(origin_identifier),
         quota::kStorageTypeTemporary,
         -deleted_size);
   }
@@ -616,7 +616,7 @@ int64 DatabaseTracker::UpdateOpenDatabaseInfoAndNotify(
     if (quota_manager_proxy_.get())
       quota_manager_proxy_->NotifyStorageModified(
           quota::QuotaClient::kDatabase,
-          webkit_base::GetOriginURLFromIdentifier(origin_id),
+          webkit_database::GetOriginFromIdentifier(origin_id),
           quota::kStorageTypeTemporary,
           new_size - old_size);
     FOR_EACH_OBSERVER(Observer, observers_, OnDatabaseSizeChanged(
@@ -687,7 +687,7 @@ int DatabaseTracker::DeleteDataModifiedSince(
        ori != origins_identifiers.end(); ++ori) {
     if (special_storage_policy_.get() &&
         special_storage_policy_->IsStorageProtected(
-            webkit_base::GetOriginURLFromIdentifier(*ori))) {
+            webkit_database::GetOriginFromIdentifier(*ori))) {
       continue;
     }
 
@@ -826,7 +826,7 @@ void DatabaseTracker::ClearSessionOnlyOrigins() {
   for (std::vector<std::string>::iterator origin =
            origin_identifiers.begin();
        origin != origin_identifiers.end(); ++origin) {
-    GURL origin_url = webkit_base::GetOriginURLFromIdentifier(*origin);
+    GURL origin_url = webkit_database::GetOriginFromIdentifier(*origin);
     if (!special_storage_policy_->IsStorageSessionOnly(origin_url))
       continue;
     if (special_storage_policy_->IsStorageProtected(origin_url))