Ensure the entire page is secure for PWAs.

chrome/browser/banners/app_banner_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/banners/app_banner_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/origin_util.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 "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
 int gCurrentRequestID = -1;
 int gTimeDeltaInDaysForTesting = 0;
 
@@ skipping 63 matching lines @@
   need_to_log_status_ = !IsDebugMode();
 
   if (contents->GetMainFrame()->GetParent()) {
     ReportStatus(contents, NOT_IN_MAIN_FRAME);
     Stop();
     return;
   }
 
   // A secure origin is required to show banners, so exit early if we see the
   // URL is invalid.
-  if (!content::IsOriginSecure(validated_url)) {
+  if (!InstallableManager::IsContentSecure(contents)) {
     ReportStatus(contents, NOT_FROM_SECURE_ORIGIN);
     Stop();
     return;
   }
 
   if (validated_url_.is_empty())
     validated_url_ = validated_url;
 
   // Any existing binding is invalid when we request a new banner.
   if (binding_.is_bound())
@@ skipping 416 matching lines @@
     // Simulate a non-canceled OnBannerPromptReply to show the delayed banner.
     // Don't reset |was_canceled_by_page_| yet for metrics purposes.
     OnBannerPromptReply(blink::mojom::AppBannerPromptReply::NONE, referrer_);
   } else {
     // Log that the prompt request was made for when we get the prompt reply.
     page_requested_prompt_ = true;
   }
 }
 
 }  // namespace banners