Use chromium logic for database identifier<->origin conversions

webkit/browser/database/database_quota_client_unittest.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 <map>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/database/database_quota_client.h"
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/database/database_util.h"
+#include "webkit/common/database/database_identifier.h"
 
 namespace webkit_database {
 
 // Declared to shorten the line lengths.
 static const quota::StorageType kTemp = quota::kStorageTypeTemporary;
 static const quota::StorageType kPerm = quota::kStorageTypePersistent;
 
 // Mock tracker class the mocks up those methods of the tracker
 // that are used by the QuotaClient.
 class MockDatabaseTracker : public DatabaseTracker {
  public:
   MockDatabaseTracker()
       : DatabaseTracker(base::FilePath(), false, NULL, NULL, NULL),
         delete_called_count_(0),
         async_delete_(false) {}
 
   virtual bool GetOriginInfo(
       const std::string& origin_identifier,
       OriginInfo* info) OVERRIDE {
     std::map<GURL, MockOriginInfo>::const_iterator found =
         mock_origin_infos_.find(
-            webkit_base::GetOriginURLFromIdentifier(origin_identifier));
+            webkit_database::GetOriginFromIdentifier(origin_identifier));
     if (found == mock_origin_infos_.end())
       return false;
     *info = OriginInfo(found->second);
     return true;
   }
 
   virtual bool GetAllOriginIdentifiers(
       std::vector<std::string>* origins_identifiers) OVERRIDE {
     std::map<GURL, MockOriginInfo>::const_iterator iter;
     for (iter = mock_origin_infos_.begin();
@@ skipping 28 matching lines @@
     }
     return net::OK;
   }
 
   void AsyncDeleteDataForOrigin(const net::CompletionCallback& callback) {
     callback.Run(net::OK);
   }
 
   void AddMockDatabase(const GURL& origin,  const char* name, int size) {
     MockOriginInfo& info = mock_origin_infos_[origin];
-    info.set_origin(webkit_base::GetOriginIdentifierFromURL(origin));
+    info.set_origin(webkit_database::GetIdentifierFromOrigin(origin));
     info.AddMockDatabase(ASCIIToUTF16(name), size);
   }
 
   int delete_called_count() { return delete_called_count_; }
   bool async_delete() { return async_delete_; }
   void set_async_delete(bool async) { async_delete_ = async; }
 
  protected:
   virtual ~MockDatabaseTracker() {}
 
@@ skipping 176 matching lines @@
   mock_tracker()->set_async_delete(false);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(1, mock_tracker()->delete_called_count());
 
   mock_tracker()->set_async_delete(true);
   EXPECT_TRUE(DeleteOriginData(&client, kTemp, kOriginA));
   EXPECT_EQ(2, mock_tracker()->delete_called_count());
 }
 
 }  // namespace webkit_database