| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 7611a931c5fcf579b49d6c3b18cdfd324f742357..8b5e64ef3e30f96d1cd9182a841c612726729546 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -61,6 +61,7 @@
|
| #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/cookie_store_factory.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/storage_partition.h"
|
| @@ -561,13 +562,6 @@ TestingProfile::GetExtensionSpecialStoragePolicy() {
|
| return extension_special_storage_policy_.get();
|
| }
|
|
|
| -net::CookieMonster* TestingProfile::GetCookieMonster() {
|
| - if (!GetRequestContext())
|
| - return NULL;
|
| - return GetRequestContext()->GetURLRequestContext()->cookie_store()->
|
| - GetCookieMonster();
|
| -}
|
| -
|
| void TestingProfile::CreateTestingPrefService() {
|
| DCHECK(!prefs_.get());
|
| testing_prefs_ = new TestingPrefServiceSyncable();
|
| @@ -655,12 +649,6 @@ void TestingProfile::RequestMIDISysExPermission(
|
| callback.Run(false);
|
| }
|
|
|
| -net::URLRequestContextGetter* TestingProfile::GetRequestContextForExtensions() {
|
| - if (!extensions_request_context_.get())
|
| - extensions_request_context_ = new TestExtensionURLRequestContextGetter();
|
| - return extensions_request_context_.get();
|
| -}
|
| -
|
| net::SSLConfigService* TestingProfile::GetSSLConfigService() {
|
| if (!GetRequestContext())
|
| return NULL;
|
| @@ -769,6 +757,10 @@ PrefService* TestingProfile::GetOffTheRecordPrefs() {
|
| return NULL;
|
| }
|
|
|
| +content::CookieStoreConfig TestingProfile::GetCookieStoreConfig() {
|
| + return content::CookieStoreConfig::InMemory();
|
| +}
|
| +
|
| quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
|
| return GetExtensionSpecialStoragePolicy();
|
| }
|
|
|