| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 8e63e5a71b59aeb7cf6ee6d6ba8e24ca5b488e6a..3cd5ea33b5c95e5d620e0c25131f43a32c6c0576 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -200,10 +200,6 @@ class TestingProfile : public Profile {
|
| 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;
|
|
|
| @@ -214,8 +210,6 @@ class TestingProfile : public Profile {
|
| 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;
|
| @@ -275,6 +269,7 @@ class TestingProfile : public Profile {
|
| virtual GURL GetHomePage() OVERRIDE;
|
|
|
| virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
|
| + virtual content::CookieStoreConfig GetCookieStoreConfig() OVERRIDE;
|
|
|
| protected:
|
| base::Time start_time_;
|
|
|