Ensure the entire page is secure for PWAs.

chrome/browser/android/webapps/add_to_homescreen_manager.cc

 // Copyright 2015 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 "chrome/browser/android/webapps/add_to_homescreen_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/installable/installable_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/origin_util.h"
 #include "jni/AddToHomescreenManager_jni.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/modules/installation/installation.mojom.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 jlong InitializeAndStart(JNIEnv* env,
@@ skipping 36 matching lines @@
   if (data_fetcher_->is_ready()) {
     // If the fetcher isn't ready yet, the shortcut will be added when it is
     // via OnDataAvailable();
     AddShortcut(data_fetcher_->shortcut_info(), data_fetcher_->shortcut_icon());
   }
 }
 
 void AddToHomescreenManager::Start(content::WebContents* web_contents) {
   bool check_webapk_compatible = false;
   if (ChromeWebApkHost::AreWebApkEnabled() &&
-      content::IsOriginSecure(web_contents->GetLastCommittedURL())) {
+      InstallableManager::IsContentSecure(web_contents)) {
     check_webapk_compatible = true;
   } else {
     ShowDialog();
   }
 
   data_fetcher_ = new AddToHomescreenDataFetcher(
       web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInPx(),
       ShortcutHelper::GetMinimumHomescreenIconSizeInPx(),
       ShortcutHelper::GetIdealSplashImageSizeInPx(),
       ShortcutHelper::GetMinimumSplashImageSizeInPx(),
@@ skipping 105 matching lines @@
 
 SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(
     const SkBitmap& bitmap,
     const GURL& url,
     bool* is_generated) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   return ShortcutHelper::FinalizeLauncherIconInBackground(bitmap, url,
                                                           is_generated);
 }