| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 1da278c25b04d705366dd3cf51128aa41062ffbe..214d6df235887b77af59b01a343d9d739cf1fa28 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -385,17 +385,17 @@ ProfileIOData::GetExtensionsRequestContext() const {
|
| ChromeURLRequestContext*
|
| ProfileIOData::GetIsolatedAppRequestContext(
|
| ChromeURLRequestContext* main_context,
|
| - const std::string& app_id,
|
| + const StoragePartitionDetails& partition_details,
|
| scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| protocol_handler_interceptor) const {
|
| LazyInitialize();
|
| ChromeURLRequestContext* context = NULL;
|
| - if (ContainsKey(app_request_context_map_, app_id)) {
|
| - context = app_request_context_map_[app_id];
|
| + if (ContainsKey(app_request_context_map_, partition_details)) {
|
| + context = app_request_context_map_[partition_details];
|
| } else {
|
| context = AcquireIsolatedAppRequestContext(
|
| - main_context, app_id, protocol_handler_interceptor.Pass());
|
| - app_request_context_map_[app_id] = context;
|
| + main_context, partition_details, protocol_handler_interceptor.Pass());
|
| + app_request_context_map_[partition_details] = context;
|
| }
|
| DCHECK(context);
|
| return context;
|
| @@ -404,14 +404,15 @@ ProfileIOData::GetIsolatedAppRequestContext(
|
| ChromeURLRequestContext*
|
| ProfileIOData::GetIsolatedMediaRequestContext(
|
| ChromeURLRequestContext* app_context,
|
| - const std::string& app_id) const {
|
| + const StoragePartitionDetails& partition_details) const {
|
| LazyInitialize();
|
| ChromeURLRequestContext* context = NULL;
|
| - if (ContainsKey(isolated_media_request_context_map_, app_id)) {
|
| - context = isolated_media_request_context_map_[app_id];
|
| + if (ContainsKey(isolated_media_request_context_map_, partition_details)) {
|
| + context = isolated_media_request_context_map_[partition_details];
|
| } else {
|
| - context = AcquireIsolatedMediaRequestContext(app_context, app_id);
|
| - isolated_media_request_context_map_[app_id] = context;
|
| + context = AcquireIsolatedMediaRequestContext(app_context,
|
| + partition_details);
|
| + isolated_media_request_context_map_[partition_details] = context;
|
| }
|
| DCHECK(context);
|
| return context;
|
|
|