Switch database/file_identifier to std::string, remove createFromDatabaseIdentifier calls

content/browser/indexed_db/indexed_db_backing_store_unittest.cc

 // Copyright (c) 2013 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 "content/browser/indexed_db/indexed_db_backing_store.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_leveldb_coding.h"
+#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
+#include "webkit/common/database/database_identifier.h"
 
-using WebKit::WebSecurityOrigin;
 using WebKit::WebIDBKey;
 
 namespace content {
 
 namespace {
 
 class IndexedDBBackingStoreTest : public testing::Test {
  public:
   IndexedDBBackingStoreTest() {}
   virtual void SetUp() {
-    string16 file_identifier;
+    std::string file_identifier;
     backing_store_ = IndexedDBBackingStore::OpenInMemory(file_identifier);
 
     // useful keys and values during tests
     const char raw_value1[] = "value1";
 
     const char raw_value2[] = "value2";
     const char raw_value3[] = "value3";
     m_value1.insert(
         m_value1.end(), &raw_value1[0], &raw_value1[0] + sizeof(raw_value1));
     m_value2.insert(
@@ skipping 287 matching lines @@
   }
 }
 
 class MockIDBFactory : public IndexedDBFactory {
  public:
   static scoped_refptr<MockIDBFactory> Create() {
     return make_scoped_refptr(new MockIDBFactory());
   }
 
   scoped_refptr<IndexedDBBackingStore> TestOpenBackingStore(
-      const WebSecurityOrigin& origin,
+      const GURL& origin,
       const base::FilePath& data_directory) {
     WebKit::WebIDBCallbacks::DataLoss data_loss =
         WebKit::WebIDBCallbacks::DataLossNone;
-    scoped_refptr<IndexedDBBackingStore> backing_store = OpenBackingStore(
-        origin.databaseIdentifier(), data_directory, &data_loss);
+    scoped_refptr<IndexedDBBackingStore> backing_store =
+        OpenBackingStore(webkit_database::GetIdentifierFromOrigin(origin),
+                         data_directory,
+                         &data_loss);
     EXPECT_EQ(WebKit::WebIDBCallbacks::DataLossNone, data_loss);
     return backing_store;
   }
 
  private:
   virtual ~MockIDBFactory() {}
 };
 
 TEST(IndexedDBFactoryTest, BackingStoreLifetime) {
-  WebSecurityOrigin origin1 =
-      WebSecurityOrigin::createFromString("http://localhost:81");
-  WebSecurityOrigin origin2 =
-      WebSecurityOrigin::createFromString("http://localhost:82");
+  GURL origin1("http://localhost:81");
+  GURL origin2("http://localhost:82");
 
   scoped_refptr<MockIDBFactory> factory = MockIDBFactory::Create();
 
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   scoped_refptr<IndexedDBBackingStore> disk_store1 =
       factory->TestOpenBackingStore(origin1, temp_directory.path());
   EXPECT_TRUE(disk_store1->HasOneRef());
 
   scoped_refptr<IndexedDBBackingStore> disk_store2 =
       factory->TestOpenBackingStore(origin1, temp_directory.path());
   EXPECT_EQ(disk_store1.get(), disk_store2.get());
   EXPECT_FALSE(disk_store2->HasOneRef());
 
   scoped_refptr<IndexedDBBackingStore> disk_store3 =
       factory->TestOpenBackingStore(origin2, temp_directory.path());
   EXPECT_TRUE(disk_store3->HasOneRef());
   EXPECT_FALSE(disk_store1->HasOneRef());
 
   disk_store2 = NULL;
   EXPECT_TRUE(disk_store1->HasOneRef());
 }
 
 TEST(IndexedDBFactoryTest, MemoryBackingStoreLifetime) {
-  WebSecurityOrigin origin1 =
-      WebSecurityOrigin::createFromString("http://localhost:81");
-  WebSecurityOrigin origin2 =
-      WebSecurityOrigin::createFromString("http://localhost:82");
+  GURL origin1("http://localhost:81");
+  GURL origin2("http://localhost:82");
 
   scoped_refptr<MockIDBFactory> factory = MockIDBFactory::Create();
   scoped_refptr<IndexedDBBackingStore> mem_store1 =
       factory->TestOpenBackingStore(origin1, base::FilePath());
   EXPECT_FALSE(mem_store1->HasOneRef());  // mem_store1 and factory
 
   scoped_refptr<IndexedDBBackingStore> mem_store2 =
       factory->TestOpenBackingStore(origin1, base::FilePath());
   EXPECT_EQ(mem_store1.get(), mem_store2.get());
   EXPECT_FALSE(mem_store1->HasOneRef());  // mem_store1, 2 and factory
@@ skipping 16 matching lines @@
 TEST(IndexedDBFactoryTest, RejectLongOrigins) {
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   const base::FilePath base_path = temp_directory.path();
   scoped_refptr<MockIDBFactory> factory = MockIDBFactory::Create();
 
   int limit = file_util::GetMaximumPathComponentLength(base_path);
   EXPECT_GT(limit, 0);
 
   std::string origin(limit + 1, 'x');
-  WebSecurityOrigin too_long_origin =
-      WebSecurityOrigin::createFromString(WebKit::WebString::fromUTF8(
-          std::string("http://" + origin + ":81/").c_str()));
+  GURL too_long_origin("http://" + origin + ":81/");
   scoped_refptr<IndexedDBBackingStore> diskStore1 =
       factory->TestOpenBackingStore(too_long_origin, base_path);
   EXPECT_FALSE(diskStore1);
 
-  WebSecurityOrigin ok_origin =
-      WebSecurityOrigin::createFromString("http://someorigin.com:82/");
+  GURL ok_origin("http://someorigin.com:82/");
   scoped_refptr<IndexedDBBackingStore> diskStore2 =
       factory->TestOpenBackingStore(ok_origin, base_path);
   EXPECT_TRUE(diskStore2);
 }
 
 }  // namespace
 
 }  // namespace content