mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "initialize crypto delegate in CookieStoreConfig"

Browse source 
This reverts commit ad1d1dce72c6fcb6c15a18dac04ff382d9bf4db0.
This commit is contained in:
Cheng Zhao 2016-09-19 16:30:16 +09:00
parent 7917aa8938
commit d435df77f8
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/brightray.gyp
View file

@ -99,8 +99,6 @@
'<(libchromiumcontent_dir)/libyuv.a', '<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a', '<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a', '<(libchromiumcontent_dir)/libsecurity_state.a',
'<(libchromiumcontent_dir)/libcookie_config.a',
'<(libchromiumcontent_dir)/libos_crypt.a',
], ],
}, },
}, { }, {
@ -156,8 +154,6 @@
'<(libchromiumcontent_dir)/libyuv.a', '<(libchromiumcontent_dir)/libyuv.a',
'<(libchromiumcontent_dir)/libcdm_renderer.a', '<(libchromiumcontent_dir)/libcdm_renderer.a',
'<(libchromiumcontent_dir)/libsecurity_state.a', '<(libchromiumcontent_dir)/libsecurity_state.a',
'<(libchromiumcontent_dir)/libcookie_config.a',
'<(libchromiumcontent_dir)/libos_crypt.a',
], ],
}, },
}, { }, {
@ -223,8 +219,6 @@
'<(libchromiumcontent_dir)/libyuv.lib', '<(libchromiumcontent_dir)/libyuv.lib',
'<(libchromiumcontent_dir)/cdm_renderer.lib', '<(libchromiumcontent_dir)/cdm_renderer.lib',
'<(libchromiumcontent_dir)/security_state.lib', '<(libchromiumcontent_dir)/security_state.lib',
'<(libchromiumcontent_dir)/cookie_config.lib',
'<(libchromiumcontent_dir)/os_crypt.lib',
# Friends of pdf.lib: # Friends of pdf.lib:
'<(libchromiumcontent_dir)/pdf.lib', '<(libchromiumcontent_dir)/pdf.lib',
'<(libchromiumcontent_dir)/ppapi_cpp_objects.lib', '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib',

2
brightray/browser/url_request_context_getter.cc
View file

@ -17,7 +17,6 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/threading/sequenced_worker_pool.h" #include "base/threading/sequenced_worker_pool.h"
#include "base/threading/worker_pool.h" #include "base/threading/worker_pool.h"
#include "components/cookie_config/cookie_store_util.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/cookie_store_factory.h" #include "content/public/browser/cookie_store_factory.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
@ -188,7 +187,6 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES, content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
nullptr, nullptr); nullptr, nullptr);
cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes(); cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes();
cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate();
cookie_store = content::CreateCookieStore(cookie_config); cookie_store = content::CreateCookieStore(cookie_config);
} }
storage_->set_cookie_store(std::move(cookie_store)); storage_->set_cookie_store(std::move(cookie_store));