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

content/browser/indexed_db/indexed_db_database.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_DATABASE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/indexed_db_pending_connection.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "content/browser/indexed_db/list_set.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
-#include "url/gurl.h"
+
+namespace url {
+class Origin;
+}
 
 namespace content {
 
 class IndexedDBBlobInfo;
 class IndexedDBConnection;
 class IndexedDBDatabaseCallbacks;
 class IndexedDBFactory;
 class IndexedDBKey;
 class IndexedDBKeyPath;
 class IndexedDBKeyRange;
 class IndexedDBTransaction;
 struct IndexedDBValue;
 
 class CONTENT_EXPORT IndexedDBDatabase
     : NON_EXPORTED_BASE(public base::RefCounted<IndexedDBDatabase>) {
  public:
   // An index and corresponding set of keys
   typedef std::pair<int64_t, std::vector<IndexedDBKey>> IndexKeys;
 
-  // Identifier is pair of (origin url, database name).
-  typedef std::pair<GURL, base::string16> Identifier;
+  // Identifier is pair of (origin, database name).
+  typedef std::pair<url::Origin, base::string16> Identifier;

[cmumford, 2016/03/31 20:54:16]

using Identifier = std::pair<url::Origin, base::string16>;

[jsbell, 2016/04/01 20:31:35]

Done.

 
   static const int64_t kInvalidId = 0;
   static const int64_t kMinimumIndexId = 30;
 
   static scoped_refptr<IndexedDBDatabase> Create(
       const base::string16& name,
       IndexedDBBackingStore* backing_store,
       IndexedDBFactory* factory,
       const Identifier& unique_identifier,
       leveldb::Status* s);
@@ skipping 247 matching lines @@
   PendingDeleteCallList pending_delete_calls_;
 
   ConnectionSet connections_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDatabase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_