Remove AppBannerManager code to skip secure context checks for tests.

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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace {
 
 bool gDisableSecureCheckForTesting = false;

[dominickn, 2016/10/25 03:13:39]

If you're removing the method, you should remove this global too.

 int gCurrentRequestID = -1;
 base::LazyInstance<base::TimeDelta> gTimeDeltaForTesting =
     LAZY_INSTANCE_INITIALIZER;
 
 // Returns |size_in_px| in dp, i.e. divided by the current device scale factor.
 int ConvertIconSizeFromPxToDp(int size_in_px) {
   return size_in_px /
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
 }
 
@@ skipping 12 matching lines @@
   params.fetch_valid_icon = true;
 
   return params;
 }
 
 }  // anonymous namespace
 
 namespace banners {
 
 // static
-void AppBannerManager::DisableSecureSchemeCheckForTesting() {
-  gDisableSecureCheckForTesting = true;
-}
-
-// static
 base::Time AppBannerManager::GetCurrentTime() {
   return base::Time::Now() + gTimeDeltaForTesting.Get();
 }
 
 // static
 void AppBannerManager::SetTimeDeltaForTesting(int days) {
   gTimeDeltaForTesting.Get() = base::TimeDelta::FromDays(days);
 }
 
 // static
@@ skipping 31 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.
+  LOG(ERROR) << validated_url;

[dominickn, 2016/10/25 03:13:39]

Remove this log spam.

   if (!content::IsOriginSecure(validated_url) &&
       !gDisableSecureCheckForTesting) {

[dominickn, 2016/10/25 03:13:39]

Remove the check for the global here. It's useless if you remove the static
setter.

     ReportStatus(contents, NOT_FROM_SECURE_ORIGIN);
     Stop();
     return;
   }
 
   if (validated_url_.is_empty())
     validated_url_ = validated_url;
 
   manager_->GetData(
       ParamsToGetManifest(),
@@ skipping 399 matching lines @@
     // Don't reset |was_canceled_by_page_| yet for metrics purposes.
     OnBannerPromptReply(render_frame_host, request_id,
                         blink::WebAppBannerPromptReply::None, referrer_);
   } else {
     // Log that the prompt request was made for when we get the prompt reply.
     page_requested_prompt_ = true;
   }
 }
 
 }  // namespace banners