From d435df77f888be12f48a7a5973aec3cf652c80c8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 19 Sep 2016 16:30:16 +0900 Subject: [PATCH] Revert "initialize crypto delegate in CookieStoreConfig" This reverts commit ad1d1dce72c6fcb6c15a18dac04ff382d9bf4db0. --- brightray/brightray.gyp | 6 ------ brightray/browser/url_request_context_getter.cc | 2 -- 2 files changed, 8 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 6931abd449..764d8d5dba 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -99,8 +99,6 @@ '<(libchromiumcontent_dir)/libyuv.a', '<(libchromiumcontent_dir)/libcdm_renderer.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)/libcdm_renderer.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)/cdm_renderer.lib', '<(libchromiumcontent_dir)/security_state.lib', - '<(libchromiumcontent_dir)/cookie_config.lib', - '<(libchromiumcontent_dir)/os_crypt.lib', # Friends of pdf.lib: '<(libchromiumcontent_dir)/pdf.lib', '<(libchromiumcontent_dir)/ppapi_cpp_objects.lib', diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index f857759b9d..601006e5c4 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -17,7 +17,6 @@ #include "base/strings/string_util.h" #include "base/threading/sequenced_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/cookie_store_factory.h" #include "content/public/common/content_switches.h" @@ -188,7 +187,6 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES, nullptr, nullptr); cookie_config.cookieable_schemes = delegate_->GetCookieableSchemes(); - cookie_config.crypto_delegate = cookie_config::GetCookieCryptoDelegate(); cookie_store = content::CreateCookieStore(cookie_config); } storage_->set_cookie_store(std::move(cookie_store));