Use chromium logic for database identifier<->origin conversions

webkit/browser/database/database_quota_client.cc

 // Copyright (c) 2012 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 "webkit/browser/database/database_quota_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/task_runner_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/database/database_util.h"
+#include "webkit/common/database/database_identifier.h"
 
 using quota::QuotaClient;
 
 namespace webkit_database {
 
 namespace {
 
 int64 GetOriginUsageOnDBThread(
     DatabaseTracker* db_tracker,
     const GURL& origin_url) {
   OriginInfo info;
   if (db_tracker->GetOriginInfo(
-          webkit_base::GetOriginIdentifierFromURL(origin_url), &info))
+          webkit_database::GetIdentifierFromOrigin(origin_url), &info))
     return info.TotalSize();
   return 0;
 }
 
 void GetOriginsOnDBThread(
     DatabaseTracker* db_tracker,
     std::set<GURL>* origins_ptr) {
   std::vector<std::string> origin_identifiers;
   if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
     for (std::vector<std::string>::const_iterator iter =
          origin_identifiers.begin();
          iter != origin_identifiers.end(); ++iter) {
-      GURL origin = webkit_base::GetOriginURLFromIdentifier(*iter);
+      GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
       origins_ptr->insert(origin);
     }
   }
 }
 
 void GetOriginsForHostOnDBThread(
     DatabaseTracker* db_tracker,
     std::set<GURL>* origins_ptr,
     const std::string& host) {
   std::vector<std::string> origin_identifiers;
   if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
     for (std::vector<std::string>::const_iterator iter =
          origin_identifiers.begin();
          iter != origin_identifiers.end(); ++iter) {
-      GURL origin = webkit_base::GetOriginURLFromIdentifier(*iter);
+      GURL origin = webkit_database::GetOriginFromIdentifier(*iter);
       if (host == net::GetHostOrSpecFromURL(origin))
         origins_ptr->insert(origin);
     }
   }
 }
 
 void DidGetOrigins(
     const QuotaClient::GetOriginsCallback& callback,
     std::set<GURL>* origins_ptr) {
   callback.Run(*origins_ptr);
@@ skipping 132 matching lines @@
   base::Callback<void(int)> delete_callback =
       base::Bind(&DidDeleteOriginData,
                  base::MessageLoopProxy::current(),
                  callback);
 
   PostTaskAndReplyWithResult(
       db_tracker_thread_.get(),
       FROM_HERE,
       base::Bind(&DatabaseTracker::DeleteDataForOrigin,
                  db_tracker_,
-                 webkit_base::GetOriginIdentifierFromURL(origin),
+                 webkit_database::GetIdentifierFromOrigin(origin),
                  delete_callback),
       delete_callback);
 }
 
 }  // namespace webkit_database