IndexedDB: Pass url::Origin rather than GURL over IPC

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"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_factory_impl.h"
 #include "content/browser/indexed_db/mock_indexed_db_callbacks.h"
 #include "content/browser/indexed_db/mock_indexed_db_database_callbacks.h"
 #include "content/browser/quota/mock_quota_manager_proxy.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #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;
 
   IndexedDBTest()
       : kNormalOrigin("http://normal/"),
@@ skipping 150 matching lines @@
 
     IndexedDBFactory* factory = idb_context->GetIDBFactory();
 
     test_path = idb_context->GetFilePathForTesting(kTestOrigin);
 
     IndexedDBPendingConnection open_connection(open_callbacks,
                                                open_db_callbacks,
                                                0 /* child_process_id */,
                                                0 /* host_transaction_id */,
                                                0 /* version */);
-    factory->Open(base::ASCIIToUTF16("opendb"),
-                  open_connection,
-                  NULL /* request_context */,
-                  kTestOrigin,
+    factory->Open(base::ASCIIToUTF16("opendb"), open_connection,
+                  NULL /* request_context */, url::Origin(kTestOrigin),
                   idb_context->data_path());
     IndexedDBPendingConnection closed_connection(closed_callbacks,
                                                  closed_db_callbacks,
                                                  0 /* child_process_id */,
                                                  0 /* host_transaction_id */,
                                                  0 /* version */);
-    factory->Open(base::ASCIIToUTF16("closeddb"),
-                  closed_connection,
-                  NULL /* request_context */,
-                  kTestOrigin,
+    factory->Open(base::ASCIIToUTF16("closeddb"), closed_connection,
+                  NULL /* request_context */, url::Origin(kTestOrigin),
                   idb_context->data_path());
 
     closed_callbacks->connection()->Close();
 
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(
             &IndexedDBContextImpl::DeleteForOrigin, idb_context, kTestOrigin));
     FlushIndexedDBTaskRunner();
     message_loop_.RunUntilIdle();
@@ skipping 45 matching lines @@
   scoped_refptr<IndexedDBFactoryImpl> factory =
       static_cast<IndexedDBFactoryImpl*>(context->GetIDBFactory());
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64_t transaction_id = 1;
   IndexedDBPendingConnection connection(
       callbacks, db_callbacks, 0 /* child_process_id */, transaction_id,
       IndexedDBDatabaseMetadata::DEFAULT_VERSION);
-  factory->Open(base::ASCIIToUTF16("db"),
-                connection,
-                NULL /* request_context */,
-                kTestOrigin,
+  factory->Open(base::ASCIIToUTF16("db"), connection,
+                NULL /* request_context */, url::Origin(kTestOrigin),
                 temp_dir.path());
 
   EXPECT_TRUE(callbacks->connection());
 
   // ConnectionOpened() is usually called by the dispatcher.
   context->ConnectionOpened(kTestOrigin, callbacks->connection());
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(kTestOrigin));
 
   // 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