Update prefservice only if it is available.

components/security_interstitials/content/security_interstitial_page.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/security_interstitials/content/security_interstitial_page.h"
 
 #include <utility>
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 16 matching lines @@
 SecurityInterstitialPage::SecurityInterstitialPage(
     content::WebContents* web_contents,
     const GURL& request_url,
     std::unique_ptr<SecurityInterstitialControllerClient> controller)
     : web_contents_(web_contents),
       request_url_(request_url),
       interstitial_page_(NULL),
       create_view_(true),
       controller_(std::move(controller)) {
   // Determine if any prefs need to be updated prior to showing the security
-  // interstitial.
-  safe_browsing::UpdatePrefsBeforeSecurityInterstitial(
-      controller_->GetPrefService());
+  // interstitial. Note that some content embedders (such as Android WebView)
+  // uses security interstitials without a prefservice.
+  if (controller_->GetPrefService()) {
+    safe_browsing::UpdatePrefsBeforeSecurityInterstitial(
+        controller_->GetPrefService());
+  }
 
   // Creating interstitial_page_ without showing it leaks memory, so don't
   // create it here.
 }
 
 SecurityInterstitialPage::~SecurityInterstitialPage() {
 }
 
 content::InterstitialPage* SecurityInterstitialPage::interstitial_page() const {
   return interstitial_page_;
@@ skipping 17 matching lines @@
       web_contents_, ShouldCreateNewNavigation(), request_url_, this);
   if (!create_view_)
     interstitial_page_->DontCreateViewForTesting();
 
   interstitial_page_->Show();
 
   controller_->set_interstitial_page(interstitial_page_);
   AfterShow();
 }
 
-bool SecurityInterstitialPage::IsPrefEnabled(const char* pref) {
-  return controller_->GetPrefService()->GetBoolean(pref);
-}
-
 SecurityInterstitialControllerClient* SecurityInterstitialPage::controller() {
   return controller_.get();
 }
 
 security_interstitials::MetricsHelper*
 SecurityInterstitialPage::metrics_helper() {
   return controller_->metrics_helper();
 }
 
 base::string16 SecurityInterstitialPage::GetFormattedHostName() const {
   return security_interstitials::common_string_util::GetFormattedHostName(
       request_url_);
 }
 
 std::string SecurityInterstitialPage::GetHTMLContents() {
   base::DictionaryValue load_time_data;
   PopulateInterstitialStrings(&load_time_data);
   webui::SetLoadTimeDataDefaults(
       controller()->GetApplicationLocale(), &load_time_data);
   std::string html = ResourceBundle::GetSharedInstance()
                          .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)
                          .as_string();
   webui::AppendWebUiCssTextDefaults(&html);
   return webui::GetI18nTemplateHtml(html, &load_time_data);
 }
 
 }  // security_interstitials