Remove storage context accessors from ResourceContext.

content/browser/storage_partition_impl.cc

Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index e906a6acb8dc22a68ba429db5a1370496b5a01d4..e4b7f1ade55c03d4594ff005b26ec073991a404c 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -13,6 +13,7 @@
 namespace content {
 
 StoragePartitionImpl::StoragePartitionImpl(
+    const std::string& partition_id,
     const FilePath& partition_path,
     quota::QuotaManager* quota_manager,
     ChromeAppCacheService* appcache_service,
@@ -20,7 +21,8 @@ StoragePartitionImpl::StoragePartitionImpl(
     webkit_database::DatabaseTracker* database_tracker,
     DOMStorageContextImpl* dom_storage_context,
     IndexedDBContextImpl* indexed_db_context)
-    : partition_path_(partition_path),
+    : partition_id_(partition_id),
+      partition_path_(partition_path),
       quota_manager_(quota_manager),
       appcache_service_(appcache_service),
       filesystem_context_(filesystem_context),
@@ -47,6 +49,7 @@ StoragePartitionImpl::~StoragePartitionImpl() {
 // need 3 pieces of info from it.
 StoragePartitionImpl* StoragePartitionImpl::Create(
     BrowserContext* context,
+    const std::string& partition_id,
     const FilePath& partition_path) {
   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
@@ -90,7 +93,8 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(quota_manager->proxy());
 
-  return new StoragePartitionImpl(partition_path,
+  return new StoragePartitionImpl(partition_id,
+                                  partition_path,
                                   quota_manager,
                                   appcache_service,
                                   filesystem_context,
@@ -99,6 +103,10 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
                                   indexed_db_context);
 }
 
+const std::string& StoragePartitionImpl::GetId() {
+  return partition_id_;
+}
+
 quota::QuotaManager* StoragePartitionImpl::GetQuotaManager() {
   return quota_manager_;
 }