Reduce use of DatabaseIdentifier in Indexed DB entry points.

content/browser/indexed_db/indexed_db_context_impl.h

Index: content/browser/indexed_db/indexed_db_context_impl.h
diff --git a/content/browser/indexed_db/indexed_db_context_impl.h b/content/browser/indexed_db/indexed_db_context_impl.h
index 9967d2c32ca0e3e96b5d888becd0c3f3eb9e28db..608e0f23394dc90096e535910f98b35890877991 100644
--- a/content/browser/indexed_db/indexed_db_context_impl.h
+++ b/content/browser/indexed_db/indexed_db_context_impl.h
@@ -74,8 +74,7 @@ class CONTENT_EXPORT IndexedDBContextImpl
   void DeleteForOrigin(const GURL& origin_url) override;
   void CopyOriginData(const GURL& origin_url,
                       IndexedDBContext* dest_context) override;
-  base::FilePath GetFilePathForTesting(
-      const std::string& origin_id) const override;
+  base::FilePath GetFilePathForTesting(const GURL& origin_url) const override;
   void SetTaskRunnerForTesting(base::SequencedTaskRunner* task_runner) override;
 
   // Methods called by IndexedDBDispatcherHost for quota support.
@@ -84,6 +83,9 @@ class CONTENT_EXPORT IndexedDBContextImpl
   void TransactionComplete(const GURL& origin_url);
   void DatabaseDeleted(const GURL& origin_url);
 
+  static base::FilePath GetBlobStoreFileName(const GURL& origin_url);
+  static base::FilePath GetLevelDBFileName(const GURL& origin_url);
+
   // Will be null in unit tests.
   storage::QuotaManagerProxy* quota_manager_proxy() const {
     return quota_manager_proxy_.get();
@@ -127,9 +129,9 @@ class CONTENT_EXPORT IndexedDBContextImpl
   typedef std::map<GURL, int64_t> OriginToSizeMap;
   class IndexedDBGetUsageAndQuotaCallback;
 
-  base::FilePath GetBlobPath(const std::string& origin_id) const;
+  base::FilePath GetBlobStorePath(const GURL& origin_url) const;
   base::FilePath GetLevelDBPath(const GURL& origin_url) const;
-  base::FilePath GetLevelDBPath(const std::string& origin_id) const;
+
   int64_t ReadUsageFromDisk(const GURL& origin_url) const;
   void EnsureDiskUsageCacheInitialized(const GURL& origin_url);
   void QueryDiskAndUpdateQuotaUsage(const GURL& origin_url);