| Index: chrome/browser/net/chrome_url_request_context.h
|
| diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
|
| index fab3f71d75408d1cd9fcf8abffbba579ad44b37e..b8a87d294b00dfa322fdcbcf631aa513d57e0225 100644
|
| --- a/chrome/browser/net/chrome_url_request_context.h
|
| +++ b/chrome/browser/net/chrome_url_request_context.h
|
| @@ -47,6 +47,9 @@ class ChromeURLRequestContext : public net::URLRequestContext {
|
| public:
|
| ChromeURLRequestContext();
|
|
|
| + // Copies the state from |other| into this context.
|
| + void CopyFrom(ChromeURLRequestContext* other);
|
| +
|
| // Gets the path to the directory user scripts are stored in.
|
| FilePath user_script_dir_path() const {
|
| return user_script_dir_path_;
|
| @@ -140,6 +143,11 @@ class ChromeURLRequestContext : public net::URLRequestContext {
|
| virtual ~ChromeURLRequestContext();
|
|
|
| private:
|
| + // ---------------------------------------------------------------------------
|
| + // Important: When adding any new members below, consider whether they need to
|
| + // be added to CopyFrom.
|
| + // ---------------------------------------------------------------------------
|
| +
|
| // Path to the directory user scripts are stored in.
|
| FilePath user_script_dir_path_;
|
|
|
| @@ -158,6 +166,11 @@ class ChromeURLRequestContext : public net::URLRequestContext {
|
|
|
| bool is_incognito_;
|
|
|
| + // ---------------------------------------------------------------------------
|
| + // Important: When adding any new members above, consider whether they need to
|
| + // be added to CopyFrom.
|
| + // ---------------------------------------------------------------------------
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContext);
|
| };
|
|
|
| @@ -213,6 +226,13 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
|
| static ChromeURLRequestContextGetter* CreateOriginalForExtensions(
|
| Profile* profile, const ProfileIOData* profile_io_data);
|
|
|
| + // Create an instance for an original profile for an app with isolated
|
| + // storage. This is expected to get called on UI thread.
|
| + static ChromeURLRequestContextGetter* CreateOriginalForIsolatedApp(
|
| + Profile* profile,
|
| + const ProfileIOData* profile_io_data,
|
| + const std::string& app_id);
|
| +
|
| // Create an instance for use with an OTR profile. This is expected to get
|
| // called on the UI thread.
|
| static ChromeURLRequestContextGetter* CreateOffTheRecord(
|
| @@ -223,6 +243,13 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
|
| static ChromeURLRequestContextGetter* CreateOffTheRecordForExtensions(
|
| Profile* profile, const ProfileIOData* profile_io_data);
|
|
|
| + // Create an instance for an OTR profile for an app with isolated storage.
|
| + // This is expected to get called on UI thread.
|
| + static ChromeURLRequestContextGetter* CreateOffTheRecordForIsolatedApp(
|
| + Profile* profile,
|
| + const ProfileIOData* profile_io_data,
|
| + const std::string& app_id);
|
| +
|
| // Clean up UI thread resources. This is expected to get called on the UI
|
| // thread before the instance is deleted on the IO thread.
|
| void CleanupOnUIThread();
|
|
|