IndexedDB: Use url::Origin rather than GURL for representing origins

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 <stdint.h>
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 #include "content/public/test/test_browser_context.h"
 #include "storage/browser/quota/quota_manager.h"
 #include "storage/browser/quota/special_storage_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/origin.h"
 
 namespace content {
 
 class IndexedDBTest : public testing::Test {
  public:
-  const GURL kNormalOrigin;
-  const GURL kSessionOnlyOrigin;
+  const url::Origin kNormalOrigin;
+  const url::Origin kSessionOnlyOrigin;
 
   IndexedDBTest()
-      : kNormalOrigin("http://normal/"),
-        kSessionOnlyOrigin("http://session-only/"),
+      : kNormalOrigin(GURL("http://normal/")),
+        kSessionOnlyOrigin(GURL("http://session-only/")),
         task_runner_(new base::TestSimpleTaskRunner),
         special_storage_policy_(new MockSpecialStoragePolicy),
         quota_manager_proxy_(new MockQuotaManagerProxy(nullptr, nullptr)),
         file_thread_(BrowserThread::FILE_USER_BLOCKING, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {
-    special_storage_policy_->AddSessionOnly(kSessionOnlyOrigin);
+    special_storage_policy_->AddSessionOnly(
+        GURL(kSessionOnlyOrigin.Serialize()));
   }
   ~IndexedDBTest() override {
     quota_manager_proxy_->SimulateQuotaManagerDestroyed();
   }
 
  protected:
   void FlushIndexedDBTaskRunner() { task_runner_->RunUntilIdle(); }
 
   base::MessageLoopForIO message_loop_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
@@ skipping 70 matching lines @@
   message_loop_.RunUntilIdle();
 
   // No data was cleared because of SetForceKeepSessionState.
   EXPECT_TRUE(base::DirectoryExists(normal_path));
   EXPECT_TRUE(base::DirectoryExists(session_only_path));
 }
 
 class ForceCloseDBCallbacks : public IndexedDBCallbacks {
  public:
   ForceCloseDBCallbacks(scoped_refptr<IndexedDBContextImpl> idb_context,
-                        const GURL& origin_url)
+                        const url::Origin& origin)
       : IndexedDBCallbacks(NULL, 0, 0),
         idb_context_(idb_context),
-        origin_url_(origin_url) {}
+        origin_(origin) {}
 
   void OnSuccess() override {}
   void OnSuccess(const std::vector<base::string16>&) override {}
   void OnSuccess(scoped_ptr<IndexedDBConnection> connection,
                  const IndexedDBDatabaseMetadata& metadata) override {
     connection_ = std::move(connection);
-    idb_context_->ConnectionOpened(origin_url_, connection_.get());
+    idb_context_->ConnectionOpened(origin_, connection_.get());
   }
 
   IndexedDBConnection* connection() { return connection_.get(); }
 
  protected:
   ~ForceCloseDBCallbacks() override {}
 
  private:
   scoped_refptr<IndexedDBContextImpl> idb_context_;
-  GURL origin_url_;
+  url::Origin origin_;
   scoped_ptr<IndexedDBConnection> connection_;
   DISALLOW_COPY_AND_ASSIGN(ForceCloseDBCallbacks);
 };
 
 TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnDelete) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   scoped_refptr<MockIndexedDBDatabaseCallbacks> open_db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> closed_db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
 
   base::FilePath test_path;
 
   // Create the scope which will ensure we run the destructor of the context.
   {
     TestBrowserContext browser_context;
 
-    const GURL kTestOrigin("http://test/");
+    const url::Origin kTestOrigin(GURL("http://test/"));
 
     scoped_refptr<IndexedDBContextImpl> idb_context =
         new IndexedDBContextImpl(temp_dir.path(),
                                  special_storage_policy_.get(),
                                  quota_manager_proxy_.get(),
                                  task_runner_.get());
 
     scoped_refptr<ForceCloseDBCallbacks> open_callbacks =
         new ForceCloseDBCallbacks(idb_context, kTestOrigin);
 
@@ skipping 16 matching lines @@
                                                  closed_db_callbacks,
                                                  0 /* child_process_id */,
                                                  0 /* host_transaction_id */,
                                                  0 /* version */);
     factory->Open(base::ASCIIToUTF16("closeddb"), closed_connection,
                   NULL /* request_context */, url::Origin(kTestOrigin),
                   idb_context->data_path());
 
     closed_callbacks->connection()->Close();
 
+    // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(
-            &IndexedDBContextImpl::DeleteForOrigin, idb_context, kTestOrigin));
+            static_cast<void (IndexedDBContextImpl::*)(const url::Origin&)>(
+                &IndexedDBContextImpl::DeleteForOrigin),
+            idb_context, kTestOrigin));
     FlushIndexedDBTaskRunner();
     message_loop_.RunUntilIdle();
   }
 
   // Make sure we wait until the destructor has run.
   message_loop_.RunUntilIdle();
 
   EXPECT_TRUE(open_db_callbacks->forced_close_called());
   EXPECT_FALSE(closed_db_callbacks->forced_close_called());
   EXPECT_FALSE(base::DirectoryExists(test_path));
 }
 
 TEST_F(IndexedDBTest, DeleteFailsIfDirectoryLocked) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  const GURL kTestOrigin("http://test/");
+  const url::Origin kTestOrigin(GURL("http://test/"));
 
   scoped_refptr<IndexedDBContextImpl> idb_context = new IndexedDBContextImpl(
       temp_dir.path(), special_storage_policy_.get(),
       quota_manager_proxy_.get(), task_runner_.get());
 
   base::FilePath test_path = idb_context->GetFilePathForTesting(kTestOrigin);
   ASSERT_TRUE(base::CreateDirectory(test_path));
 
   scoped_ptr<LevelDBLock> lock =
       LevelDBDatabase::LockForTesting(test_path);
   ASSERT_TRUE(lock);
 
+  // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
   idb_context->TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(
-          &IndexedDBContextImpl::DeleteForOrigin, idb_context, kTestOrigin));
+          static_cast<void (IndexedDBContextImpl::*)(const url::Origin&)>(
+              &IndexedDBContextImpl::DeleteForOrigin),
+          idb_context, kTestOrigin));
   FlushIndexedDBTaskRunner();
 
   EXPECT_TRUE(base::DirectoryExists(test_path));
 }
 
 TEST_F(IndexedDBTest, ForceCloseOpenDatabasesOnCommitFailure) {
-  const GURL kTestOrigin("http://test/");
+  const url::Origin kTestOrigin(GURL("http://test/"));
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   scoped_refptr<IndexedDBContextImpl> context =
       new IndexedDBContextImpl(temp_dir.path(), special_storage_policy_.get(),
                                quota_manager_proxy_.get(), task_runner_.get());
 
   scoped_refptr<IndexedDBFactoryImpl> factory =
       static_cast<IndexedDBFactoryImpl*>(context->GetIDBFactory());
@@ skipping 18 matching lines @@
 
   // Simulate the write failure.
   leveldb::Status status = leveldb::Status::IOError("Simulated failure");
   callbacks->connection()->database()->TransactionCommitFailed(status);
 
   EXPECT_TRUE(db_callbacks->forced_close_called());
   EXPECT_FALSE(factory->IsBackingStoreOpen(kTestOrigin));
 }
 
 }  // namespace content