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

content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc

 // Copyright 2014 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 <set>
 
 #include "base/macros.h"
 #include "base/test/test_simple_task_runner.h"
 #include "content/browser/indexed_db/indexed_db_active_blob_registry.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_fake_backing_store.h"
 #include "content/browser/indexed_db/mock_indexed_db_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/origin.h"
 
 namespace content {
 
 namespace {
 
 class RegistryTestMockFactory : public MockIndexedDBFactory {
  public:
   RegistryTestMockFactory() : duplicate_calls_(false) {}
 
-  void ReportOutstandingBlobs(const GURL& origin_url,
+  void ReportOutstandingBlobs(const url::Origin& origin,
                               bool blobs_outstanding) override {
     if (blobs_outstanding) {
-      if (origins_.count(origin_url)) {
+      if (origins_.count(origin)) {
         duplicate_calls_ = true;
       } else {
-        origins_.insert(origin_url);
+        origins_.insert(origin);
       }
     } else {
-      if (!origins_.count(origin_url)) {
+      if (!origins_.count(origin)) {
         duplicate_calls_ = true;
       } else {
-        origins_.erase(origin_url);
+        origins_.erase(origin);
       }
     }
   }
 
   bool CheckNoOriginsInUse() const {
     return !duplicate_calls_ && !origins_.size();
   }
 
-  bool CheckSingleOriginInUse(const GURL& origin) const {
+  bool CheckSingleOriginInUse(const url::Origin& origin) const {
     return !duplicate_calls_ && origins_.size() == 1 && origins_.count(origin);
   }
 
  private:
   ~RegistryTestMockFactory() override {}
 
-  std::set<GURL> origins_;
+  std::set<url::Origin> origins_;
   bool duplicate_calls_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistryTestMockFactory);
 };
 
 class MockIDBBackingStore : public IndexedDBFakeBackingStore {
  public:
   typedef std::pair<int64_t, int64_t> KeyPair;
   typedef std::set<KeyPair> KeyPairSet;
 
@@ skipping 73 matching lines @@
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   base::Closure add_ref =
       registry()->GetAddBlobRefCallback(kDatabaseId0, kBlobKey0);
   ReleaseCallback release =
       registry()->GetFinalReleaseCallback(kDatabaseId0, kBlobKey0);
   add_ref.Run();
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   release.Run(base::FilePath());
   RunUntilIdle();
 
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 }
 
 TEST_F(IndexedDBActiveBlobRegistryTest, DeleteWhileInUse) {
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   base::Closure add_ref =
       registry()->GetAddBlobRefCallback(kDatabaseId0, kBlobKey0);
   ReleaseCallback release =
       registry()->GetFinalReleaseCallback(kDatabaseId0, kBlobKey0);
 
   add_ref.Run();
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   EXPECT_TRUE(registry()->MarkDeletedCheckIfUsed(kDatabaseId0, kBlobKey0));
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   release.Run(base::FilePath());
   RunUntilIdle();
 
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckSingleUnusedBlob(kDatabaseId0, kBlobKey0));
 }
 
 TEST_F(IndexedDBActiveBlobRegistryTest, MultipleBlobs) {
@@ skipping 14 matching lines @@
       registry()->GetFinalReleaseCallback(kDatabaseId1, kBlobKey0);
   base::Closure add_ref_11 =
       registry()->GetAddBlobRefCallback(kDatabaseId1, kBlobKey1);
   ReleaseCallback release_11 =
       registry()->GetFinalReleaseCallback(kDatabaseId1, kBlobKey1);
 
   add_ref_00.Run();
   add_ref_01.Run();
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   release_00.Run(base::FilePath());
   add_ref_10.Run();
   add_ref_11.Run();
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   EXPECT_TRUE(registry()->MarkDeletedCheckIfUsed(kDatabaseId0, kBlobKey1));
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   release_01.Run(base::FilePath());
   release_11.Run(base::FilePath());
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckSingleUnusedBlob(kDatabaseId0, kBlobKey1));
 
   release_10.Run(base::FilePath());
   RunUntilIdle();
 
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckSingleUnusedBlob(kDatabaseId0, kBlobKey1));
 }
 
 TEST_F(IndexedDBActiveBlobRegistryTest, ForceShutdown) {
   EXPECT_TRUE(factory()->CheckNoOriginsInUse());
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   base::Closure add_ref_0 =
       registry()->GetAddBlobRefCallback(kDatabaseId0, kBlobKey0);
   ReleaseCallback release_0 =
       registry()->GetFinalReleaseCallback(kDatabaseId0, kBlobKey0);
   base::Closure add_ref_1 =
       registry()->GetAddBlobRefCallback(kDatabaseId0, kBlobKey1);
   ReleaseCallback release_1 =
       registry()->GetFinalReleaseCallback(kDatabaseId0, kBlobKey1);
 
   add_ref_0.Run();
   RunUntilIdle();
 
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   registry()->ForceShutdown();
 
   add_ref_1.Run();
   RunUntilIdle();
 
   // Nothing changes.
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 
   release_0.Run(base::FilePath());
   release_1.Run(base::FilePath());
   RunUntilIdle();
 
   // Nothing changes.
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 }
 
 }  // namespace
 
 }  // namespace content