| Index: trunk/src/chrome/test/base/testing_profile.h
|
| ===================================================================
|
| --- trunk/src/chrome/test/base/testing_profile.h (revision 219785)
|
| +++ trunk/src/chrome/test/base/testing_profile.h (working copy)
|
| @@ -192,10 +192,6 @@
|
| virtual bool IsOffTheRecord() const OVERRIDE;
|
| virtual content::DownloadManagerDelegate*
|
| GetDownloadManagerDelegate() OVERRIDE;
|
| - virtual void OverrideCookieStoreConfigs(const base::FilePath& partition_path,
|
| - bool in_memory_partition,
|
| - bool is_default_partition,
|
| - CookieSchemeMap* configs) OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
|
| virtual net::URLRequestContextGetter* CreateRequestContext(
|
| content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| @@ -239,6 +235,10 @@
|
| ExtensionSpecialStoragePolicy* extension_special_storage_policy);
|
| virtual ExtensionSpecialStoragePolicy*
|
| GetExtensionSpecialStoragePolicy() OVERRIDE;
|
| + // TODO(ajwong): Remove this API in favor of directly retrieving the
|
| + // CookieStore from the StoragePartition after ExtensionURLRequestContext
|
| + // has been removed.
|
| + net::CookieMonster* GetCookieMonster();
|
|
|
| virtual PrefService* GetPrefs() OVERRIDE;
|
|
|
| @@ -249,6 +249,8 @@
|
| virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
|
| int renderer_child_id) OVERRIDE;
|
| virtual net::URLRequestContextGetter*
|
| + GetRequestContextForExtensions() OVERRIDE;
|
| + virtual net::URLRequestContextGetter*
|
| GetMediaRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory) OVERRIDE;
|
|
|