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

content/browser/indexed_db/indexed_db_dispatcher_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 21 matching lines @@
 struct IndexedDBHostMsg_DatabaseDeleteRange_Params;
 struct IndexedDBHostMsg_DatabaseGet_Params;
 struct IndexedDBHostMsg_DatabaseGetAll_Params;
 struct IndexedDBHostMsg_DatabaseOpenCursor_Params;
 struct IndexedDBHostMsg_DatabasePut_Params;
 struct IndexedDBHostMsg_DatabaseSetIndexKeys_Params;
 struct IndexedDBHostMsg_FactoryDeleteDatabase_Params;
 struct IndexedDBHostMsg_FactoryGetDatabaseNames_Params;
 struct IndexedDBHostMsg_FactoryOpen_Params;
 
+namespace url {
+class Origin;
+}
+
 namespace content {
 class IndexedDBBlobInfo;
 class IndexedDBConnection;
 class IndexedDBContextImpl;
 class IndexedDBCursor;
 class IndexedDBKey;
 class IndexedDBKeyPath;
 class IndexedDBKeyRange;
 struct IndexedDBDatabaseMetadata;
 
@@ skipping 27 matching lines @@
   IndexedDBContextImpl* context() const { return indexed_db_context_.get(); }
   storage::BlobStorageContext* blob_storage_context() const {
     return blob_storage_context_->context();
   }
 
   // IndexedDBCallbacks call these methods to add the results into the
   // applicable map.  See below for more details.
   int32_t Add(IndexedDBCursor* cursor);
   int32_t Add(IndexedDBConnection* connection,
               int32_t ipc_thread_id,
-              const GURL& origin_url);
+              const url::Origin& origin);
 
   void RegisterTransactionId(int64_t host_transaction_id,
-                             const GURL& origin_url);
+                             const url::Origin& origin);
 
   IndexedDBCursor* GetCursorFromId(int32_t ipc_cursor_id);
 
   // These are called to map a 32-bit front-end (renderer-specific) transaction
   // id to and from a back-end ("host") transaction id that encodes the process
   // id in the high 32 bits. The mapping is host-specific and ids are validated.
   int64_t HostTransactionId(int64_t transaction_id);
   int64_t RendererTransactionId(int64_t host_transaction_id);
 
   // These are called to decode a host transaction ID, for diagnostic purposes.
   static uint32_t TransactionIdToRendererTransactionId(
       int64_t host_transaction_id);
   static uint32_t TransactionIdToProcessId(int64_t host_transaction_id);
 
   std::string HoldBlobData(const IndexedDBBlobInfo& blob_info);
 
  private:
   // Friends to enable OnDestruct() delegation.
   friend class BrowserThread;
   friend class base::DeleteHelper<IndexedDBDispatcherHost>;
 
   // Used in nested classes.
   typedef std::map<std::string, std::pair<storage::BlobDataHandle*, int>>
       BlobDataHandleMap;
   typedef std::map<int64_t, int64_t> TransactionIDToDatabaseIDMap;
   typedef std::map<int64_t, uint64_t> TransactionIDToSizeMap;
-  typedef std::map<int64_t, GURL> TransactionIDToURLMap;
-  typedef std::map<int32_t, GURL> WebIDBObjectIDToURLMap;
+  typedef std::map<int64_t, url::Origin> TransactionIDToOriginMap;
+  typedef std::map<int32_t, url::Origin> WebIDBObjectIDToOriginMap;
 
   // IDMap for RefCounted types
   template <typename RefCountedType>
   class RefIDMap {
    public:
     typedef int32_t KeyType;
 
     RefIDMap() {}
     ~RefIDMap() {}
 
@@ skipping 71 matching lines @@
     void OnAbort(int32_t ipc_database_id, int64_t transaction_id);
     void OnCommit(int32_t ipc_database_id, int64_t transaction_id);
     void OnGotUsageAndQuotaForCommit(int32_t ipc_database_id,
                                      int64_t transaction_id,
                                      storage::QuotaStatusCode status,
                                      int64_t usage,
                                      int64_t quota);
 
     IndexedDBDispatcherHost* parent_;
     IDMap<IndexedDBConnection, IDMapOwnPointer> map_;
-    WebIDBObjectIDToURLMap database_url_map_;
+    WebIDBObjectIDToOriginMap database_origin_map_;
     TransactionIDToSizeMap transaction_size_map_;
-    TransactionIDToURLMap transaction_url_map_;
+    TransactionIDToOriginMap transaction_origin_map_;
     TransactionIDToDatabaseIDMap transaction_database_map_;
 
     // Weak pointers are used when an asynchronous quota request is made, in
     // case the dispatcher is torn down before the response returns.
     base::WeakPtrFactory<DatabaseDispatcherHost> weak_factory_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(DatabaseDispatcherHost);
   };
 
@@ skipping 73 matching lines @@
 
   // Used to set file permissions for blob storage.
   int ipc_process_id_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_