| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index 879a883eae7c80dfb5d8a6298b283f5985938d2e..4dcea33d6e20b63ef992aa79a739f2a09b217581 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -36,7 +36,6 @@
|
| #include "content/browser/renderer_host/render_widget_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_android.h"
|
| #include "content/browser/screen_orientation/screen_orientation_dispatcher_host.h"
|
| -#include "content/browser/ssl/ssl_host_state.h"
|
| #include "content/browser/transition_request_manager.h"
|
| #include "content/browser/web_contents/web_contents_view_android.h"
|
| #include "content/common/frame_messages.h"
|
| @@ -47,6 +46,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/favicon_status.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| +#include "content/public/browser/ssl_host_state_delegate.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/content_switches.h"
|
| @@ -1413,9 +1413,13 @@ void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter,
|
| }
|
|
|
| void ContentViewCoreImpl::ClearSslPreferences(JNIEnv* env, jobject obj) {
|
| - SSLHostState* state = SSLHostState::GetFor(
|
| - web_contents_->GetController().GetBrowserContext());
|
| - state->Clear();
|
| + content::SSLHostStateDelegate* delegate =
|
| + web_contents_->
|
| + GetController().
|
| + GetBrowserContext()->
|
| + GetSSLHostStateDelegate();
|
| + if (delegate)
|
| + delegate->Clear();
|
| }
|
|
|
| void ContentViewCoreImpl::SetUseDesktopUserAgent(
|
|
|