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

content/browser/indexed_db/indexed_db_backing_store.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 18 matching lines @@
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/leveldb/leveldb_iterator.h"
 #include "content/browser/indexed_db/leveldb/leveldb_transaction.h"
 #include "content/common/content_export.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "third_party/leveldatabase/src/include/leveldb/status.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace storage {
 class FileWriterDelegate;
 }
 
 namespace net {
@@ skipping 303 matching lines @@
     // case has additional complexity of not being symmetric with
     // NextNoDuplicate.
     bool ContinuePrevious(const IndexedDBKey* key,
                           const IndexedDBKey* primary_key,
                           IteratorState state,
                           leveldb::Status*);
 
     DISALLOW_COPY_AND_ASSIGN(Cursor);
   };
 
-  const GURL& origin_url() const { return origin_url_; }
+  const url::Origin& origin() const { return origin_; }
   IndexedDBFactory* factory() const { return indexed_db_factory_; }
   base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); }
   base::OneShotTimer* close_timer() { return &close_timer_; }
   IndexedDBActiveBlobRegistry* active_blob_registry() {
     return &active_blob_registry_;
   }
 
   static scoped_refptr<IndexedDBBackingStore> Open(
       IndexedDBFactory* indexed_db_factory,
-      const GURL& origin_url,
+      const url::Origin& origin,
       const base::FilePath& path_base,
       net::URLRequestContext* request_context,
       blink::WebIDBDataLoss* data_loss,
       std::string* data_loss_message,
       bool* disk_full,
       base::SequencedTaskRunner* task_runner,
       bool clean_journal,
       leveldb::Status* status);
   static scoped_refptr<IndexedDBBackingStore> Open(
       IndexedDBFactory* indexed_db_factory,
-      const GURL& origin_url,
+      const url::Origin& origin,
       const base::FilePath& path_base,
       net::URLRequestContext* request_context,
       blink::WebIDBDataLoss* data_loss,
       std::string* data_loss_message,
       bool* disk_full,
       LevelDBFactory* leveldb_factory,
       base::SequencedTaskRunner* task_runner,
       bool clean_journal,
       leveldb::Status* status);
   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
-      const GURL& origin_url,
+      const url::Origin& origin,
       base::SequencedTaskRunner* task_runner,
       leveldb::Status* status);
   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
-      const GURL& origin_url,
+      const url::Origin& origin,
       LevelDBFactory* leveldb_factory,
       base::SequencedTaskRunner* task_runner,
       leveldb::Status* status);
 
   void GrantChildProcessPermissions(int child_process_id);
 
   // Compact is public for testing.
   virtual void Compact();
   virtual std::vector<base::string16> GetDatabaseNames(leveldb::Status*);
   virtual leveldb::Status GetIDBDatabaseMetaData(
       const base::string16& name,
       IndexedDBDatabaseMetadata* metadata,
       bool* success) WARN_UNUSED_RESULT;
   virtual leveldb::Status CreateIDBDatabaseMetaData(const base::string16& name,
                                                     int64_t version,
                                                     int64_t* row_id);
   virtual bool UpdateIDBDatabaseIntVersion(
       IndexedDBBackingStore::Transaction* transaction,
       int64_t row_id,
       int64_t version);
   virtual leveldb::Status DeleteDatabase(const base::string16& name);
 
   // Assumes caller has already closed the backing store.
   static leveldb::Status DestroyBackingStore(const base::FilePath& path_base,
-                                             const GURL& origin_url);
+                                             const url::Origin& origin);
   static bool RecordCorruptionInfo(const base::FilePath& path_base,
-                                   const GURL& origin_url,
+                                   const url::Origin& origin,
                                    const std::string& message);
   leveldb::Status GetObjectStores(
       int64_t database_id,
       IndexedDBDatabaseMetadata::ObjectStoreMap* map) WARN_UNUSED_RESULT;
   virtual leveldb::Status CreateObjectStore(
       IndexedDBBackingStore::Transaction* transaction,
       int64_t database_id,
       int64_t object_store_id,
       const base::string16& name,
       const IndexedDBKeyPath& key_path,
@@ skipping 120 matching lines @@
       int64_t object_store_id,
       int64_t index_id,
       const IndexedDBKeyRange& key_range,
       blink::WebIDBCursorDirection,
       leveldb::Status*);
 
  protected:
   friend class base::RefCounted<IndexedDBBackingStore>;
 
   IndexedDBBackingStore(IndexedDBFactory* indexed_db_factory,
-                        const GURL& origin_url,
+                        const url::Origin& origin,
                         const base::FilePath& blob_path,
                         net::URLRequestContext* request_context,
                         std::unique_ptr<LevelDBDatabase> db,
                         std::unique_ptr<LevelDBComparator> comparator,
                         base::SequencedTaskRunner* task_runner);
   virtual ~IndexedDBBackingStore();
 
   bool is_incognito() const { return !indexed_db_factory_; }
 
   leveldb::Status SetUpMetadata();
@@ skipping 13 matching lines @@
 
   // Attempt to clean the primary journal. This will remove
   // any referenced files and delete the journal entry. If any
   // transaction is currently committing this will be deferred
   // via StartJournalCleaningTimer().
   void CleanPrimaryJournalIgnoreReturn();
 
  private:
   static scoped_refptr<IndexedDBBackingStore> Create(
       IndexedDBFactory* indexed_db_factory,
-      const GURL& origin_url,
+      const url::Origin& origin,
       const base::FilePath& blob_path,
       net::URLRequestContext* request_context,
       std::unique_ptr<LevelDBDatabase> db,
       std::unique_ptr<LevelDBComparator> comparator,
       base::SequencedTaskRunner* task_runner,
       leveldb::Status* status);
 
   static bool ReadCorruptionInfo(const base::FilePath& path_base,
-                                 const GURL& origin_url,
+                                 const url::Origin& origin,
                                  std::string* message);
 
   leveldb::Status FindKeyInIndex(
       IndexedDBBackingStore::Transaction* transaction,
       int64_t database_id,
       int64_t object_store_id,
       int64_t index_id,
       const IndexedDBKey& key,
       std::string* found_encoded_primary_key,
       bool* found);
@@ skipping 11 matching lines @@
   // This must not be used while temporary entries are present e.g. during
   // a two-stage transaction commit with blobs.
   leveldb::Status CleanUpBlobJournal(const std::string& level_db_key) const;
 
   // Synchronously delete the files and/or directories on disk referenced by
   // the blob journal.
   leveldb::Status CleanUpBlobJournalEntries(
       const BlobJournalType& journal) const;
 
   IndexedDBFactory* indexed_db_factory_;
-  const GURL origin_url_;
+  const url::Origin origin_;
   base::FilePath blob_path_;
 
   // The origin identifier is a key prefix unique to the origin used in the
   // leveldb backing store to partition data by origin. It is a normalized
   // version of the origin URL with a versioning suffix appended, e.g.
   // "http_localhost_81@1" Since only one origin is stored per backing store
   // this is redundant but necessary for backwards compatibility; the suffix
   // provides for future flexibility.
   const std::string origin_identifier_;
 
@@ skipping 14 matching lines @@
   // complete. While > 0, temporary journal entries may exist so out-of-band
   // journal cleaning must be deferred.
   size_t committing_transaction_count_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBBackingStore);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_