| Index: chrome/browser/profiles/profile_impl_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
|
| index 55740c584ec2b64583cae80c5778056da2909e35..c780bbbcf50d2f0df95c477c40531efec680f447 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.h
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.h
|
| @@ -66,17 +66,28 @@ class ProfileImplIOData : public ProfileIOData {
|
| GetExtensionsRequestContextGetter() const;
|
| scoped_refptr<ChromeURLRequestContextGetter>
|
| GetIsolatedAppRequestContextGetter(
|
| - const std::string& app_id) const;
|
| + const FilePath& partition_path,
|
| + bool in_memory) const;
|
| scoped_refptr<ChromeURLRequestContextGetter>
|
| GetIsolatedMediaRequestContextGetter(
|
| - const std::string& app_id) const;
|
| + const FilePath& partition_path,
|
| + bool in_memory) const;
|
|
|
| void ClearNetworkingHistorySince(base::Time time);
|
|
|
| private:
|
| - typedef base::hash_map<std::string,
|
| - scoped_refptr<ChromeURLRequestContextGetter> >
|
| - ChromeURLRequestContextGetterMap;
|
| +#if defined(COMPILER_MSVC)
|
| + typedef BASE_HASH_NAMESPACE::hash_map<
|
| + StoragePartitionDescriptor, scoped_refptr<ChromeURLRequestContextGetter>,
|
| + BASE_HASH_NAMESPACE::hash_compare<StoragePartitionDescriptor,
|
| + StoragePartitionDescriptorLess> >
|
| +#elif defined(COMPILER_GCC)
|
| + typedef BASE_HASH_NAMESPACE::hash_map< \
|
| + StoragePartitionDescriptor, scoped_refptr<ChromeURLRequestContextGetter>,
|
| + BASE_HASH_NAMESPACE::hash<StoragePartitionDescriptor>,
|
| + StoragePartitionDescriptorEq>
|
| +#endif
|
| + ChromeURLRequestContextGetterMap;
|
|
|
| // Lazily initialize ProfileParams. We do this on the calls to
|
| // Get*RequestContextGetter(), so we only initialize ProfileParams right
|
| @@ -139,24 +150,25 @@ class ProfileImplIOData : public ProfileIOData {
|
| ProfileParams* profile_params) const OVERRIDE;
|
| virtual ChromeURLRequestContext* InitializeAppRequestContext(
|
| ChromeURLRequestContext* main_context,
|
| - const std::string& app_id,
|
| + const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| protocol_handler_interceptor) const OVERRIDE;
|
| virtual ChromeURLRequestContext* InitializeMediaRequestContext(
|
| ChromeURLRequestContext* original_context,
|
| - const std::string& app_id) const OVERRIDE;
|
| + const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
|
| virtual ChromeURLRequestContext*
|
| AcquireMediaRequestContext() const OVERRIDE;
|
| virtual ChromeURLRequestContext*
|
| AcquireIsolatedAppRequestContext(
|
| ChromeURLRequestContext* main_context,
|
| - const std::string& app_id,
|
| + const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| protocol_handler_interceptor) const OVERRIDE;
|
| virtual ChromeURLRequestContext*
|
| AcquireIsolatedMediaRequestContext(
|
| ChromeURLRequestContext* app_context,
|
| - const std::string& app_id) const OVERRIDE;
|
| + const StoragePartitionDescriptor& partition_descriptor)
|
| + const OVERRIDE;
|
| virtual chrome_browser_net::LoadTimeStats* GetLoadTimeStats(
|
| IOThread::Globals* io_thread_globals) const OVERRIDE;
|
|
|
|
|