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

content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc

Index: content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc b/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc
index 75377367594281ef7d90e5b8150cb5c17a6120f6..a34e632b283a136b7dfd967e35262da2b45c3197 100644
--- a/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc
@@ -13,6 +13,7 @@
 #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 {
 
@@ -22,19 +23,19 @@ 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);
       }
     }
   }
@@ -43,14 +44,14 @@ class RegistryTestMockFactory : public MockIndexedDBFactory {
     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);
@@ -144,7 +145,7 @@ TEST_F(IndexedDBActiveBlobRegistryTest, SimpleUse) {
   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());
@@ -166,13 +167,13 @@ TEST_F(IndexedDBActiveBlobRegistryTest, DeleteWhileInUse) {
   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());
@@ -207,7 +208,7 @@ TEST_F(IndexedDBActiveBlobRegistryTest, MultipleBlobs) {
   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());
@@ -215,20 +216,20 @@ TEST_F(IndexedDBActiveBlobRegistryTest, MultipleBlobs) {
   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());
@@ -254,7 +255,7 @@ TEST_F(IndexedDBActiveBlobRegistryTest, ForceShutdown) {
   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();
@@ -263,7 +264,7 @@ TEST_F(IndexedDBActiveBlobRegistryTest, ForceShutdown) {
   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());
@@ -271,7 +272,7 @@ TEST_F(IndexedDBActiveBlobRegistryTest, ForceShutdown) {
   RunUntilIdle();
 
   // Nothing changes.
-  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin_url()));
+  EXPECT_TRUE(factory()->CheckSingleOriginInUse(backing_store()->origin()));
   EXPECT_TRUE(backing_store()->CheckUnusedBlobsEmpty());
 }