Modify behavior of --bypass-app-banner-engagement-checks flag.

This flag now does not bypass the checks for whether the app has been
added to the homescreen or not.

BUG=467374

Review URL: https://codereview.chromium.org/1011963003

Cr-Commit-Position: refs/heads/master@{#320968}

chrome/browser/banners/app_banner_settings_helper.cc

@@ -180,11 +180,6 @@ bool AppBannerSettingsHelper::ShouldShowBanner(
     const GURL& origin_url,
     const std::string& package_name_or_start_url,
     base::Time time) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kBypassAppBannerEngagementChecks)) {
-    return true;
-  }
-
   // Don't show if it has been added to the homescreen.
   base::Time added_time =
       GetSingleBannerEvent(web_contents, origin_url, package_name_or_start_url,
@@ -194,6 +189,12 @@ bool AppBannerSettingsHelper::ShouldShowBanner(
     return false;
   }
 
+  // Otherwise, ignore all checks if the flag to do so is set.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kBypassAppBannerEngagementChecks)) {
+    return true;
+  }
+
   base::Time blocked_time =
       GetSingleBannerEvent(web_contents, origin_url, package_name_or_start_url,
                            APP_BANNER_EVENT_DID_BLOCK);