Use chromium logic for database identifier<->origin conversions

content/browser/indexed_db/indexed_db_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 "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/quota/mock_special_storage_policy.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/browser/quota/special_storage_policy.h"
+#include "webkit/common/database/database_identifier.h"
 
 namespace content {
 
 class IndexedDBTest : public testing::Test {
  public:
   IndexedDBTest()
       : message_loop_(base::MessageLoop::TYPE_IO),
         webkit_thread_(BrowserThread::WEBKIT_DEPRECATED, &message_loop_),
         file_thread_(BrowserThread::FILE_USER_BLOCKING, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
@@ skipping 29 matching lines @@
     // With the levelDB backend, these are directories.
     IndexedDBContextImpl* idb_context = static_cast<IndexedDBContextImpl*>(
         BrowserContext::GetDefaultStoragePartition(&browser_context)
             ->GetIndexedDBContext());
 
     // Override the storage policy with our own.
     idb_context->special_storage_policy_ = special_storage_policy;
     idb_context->set_data_path_for_testing(temp_dir.path());
 
     normal_path = idb_context->GetFilePathForTesting(
-        webkit_base::GetOriginIdentifierFromURL(kNormalOrigin));
+        webkit_database::GetIdentifierFromOrigin(kNormalOrigin));
     session_only_path = idb_context->GetFilePathForTesting(
-        webkit_base::GetOriginIdentifierFromURL(kSessionOnlyOrigin));
+        webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(normal_path));
     ASSERT_TRUE(file_util::CreateDirectory(session_only_path));
     message_loop_.RunUntilIdle();
   }
 
   message_loop_.RunUntilIdle();
 
   EXPECT_TRUE(file_util::DirectoryExists(normal_path));
   EXPECT_FALSE(file_util::DirectoryExists(session_only_path));
 }
@@ skipping 23 matching lines @@
             ->GetIndexedDBContext());
 
     // Override the storage policy with our own.
     idb_context->special_storage_policy_ = special_storage_policy;
     idb_context->set_data_path_for_testing(temp_dir.path());
 
     // Save session state. This should bypass the destruction-time deletion.
     idb_context->SetForceKeepSessionState();
 
     normal_path = idb_context->GetFilePathForTesting(
-        webkit_base::GetOriginIdentifierFromURL(kNormalOrigin));
+        webkit_database::GetIdentifierFromOrigin(kNormalOrigin));
     session_only_path = idb_context->GetFilePathForTesting(
-        webkit_base::GetOriginIdentifierFromURL(kSessionOnlyOrigin));
+        webkit_database::GetIdentifierFromOrigin(kSessionOnlyOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(normal_path));
     ASSERT_TRUE(file_util::CreateDirectory(session_only_path));
     message_loop_.RunUntilIdle();
   }
 
   // Make sure we wait until the destructor has run.
   message_loop_.RunUntilIdle();
 
   // No data was cleared because of SetForceKeepSessionState.
   EXPECT_TRUE(file_util::DirectoryExists(normal_path));
@@ skipping 35 matching lines @@
     const GURL kTestOrigin("http://test/");
 
     IndexedDBContextImpl* idb_context = static_cast<IndexedDBContextImpl*>(
         BrowserContext::GetDefaultStoragePartition(&browser_context)
             ->GetIndexedDBContext());
 
     idb_context->quota_manager_proxy_ = NULL;
     idb_context->set_data_path_for_testing(temp_dir.path());
 
     test_path = idb_context->GetFilePathForTesting(
-        webkit_base::GetOriginIdentifierFromURL(kTestOrigin));
+        webkit_database::GetIdentifierFromOrigin(kTestOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(test_path));
 
     const bool kExpectForceClose = true;
 
     MockWebIDBDatabase connection1(kExpectForceClose);
     idb_context->ConnectionOpened(kTestOrigin, &connection1);
 
     MockWebIDBDatabase connection2(!kExpectForceClose);
     idb_context->ConnectionOpened(kTestOrigin, &connection2);
     idb_context->ConnectionClosed(kTestOrigin, &connection2);
 
     idb_context->DeleteForOrigin(kTestOrigin);
 
     message_loop_.RunUntilIdle();
   }
 
   // Make sure we wait until the destructor has run.
   message_loop_.RunUntilIdle();
 
   EXPECT_FALSE(file_util::DirectoryExists(test_path));
 }
 
 }  // namespace content