Move banner counting logic much later in the pipeline

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 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 "chrome/browser/android/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 181 matching lines @@
     // TODO(benwells): Check triggering parameters.
     // Create an infobar to promote the manifest's app.
     GURL icon_url =
         ManifestIconSelector::FindBestMatchingIcon(
             web_app_data_.icons,
             GetPreferredIconSize(),
             gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
     if (icon_url.is_empty())
       return;
 
-    RecordCouldShowBanner(web_app_data_.start_url.spec());
-    if (!CheckIfShouldShow(web_app_data_.start_url.spec()))
-      return;
-
     FetchIcon(icon_url);
   }
 }
 
 void AppBannerManager::RecordCouldShowBanner(
     const std::string& package_or_start_url) {
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), validated_url_, package_or_start_url,
       AppBannerSettingsHelper::APP_BANNER_EVENT_COULD_SHOW, base::Time::Now());
 }
@@ skipping 32 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
   if (jobj.is_null())
     return;
 
   app_icon_.reset(new SkBitmap(*bitmap));
   InfoBarService* service = InfoBarService::FromWebContents(web_contents());
 
   weak_infobar_ptr_ = nullptr;
   if (!native_app_data_.is_null()) {
+    RecordCouldShowBanner(native_app_package_);
+    if (!CheckIfShouldShow(native_app_package_))
+      return;
+
     weak_infobar_ptr_ = AppBannerInfoBarDelegate::CreateForNativeApp(
         service,
         this,
         native_app_data_);
   } else if (!web_app_data_.IsEmpty()){
+    RecordCouldShowBanner(web_app_data_.start_url.spec());
+    if (!CheckIfShouldShow(web_app_data_.start_url.spec()))
+      return;
+
     weak_infobar_ptr_ = AppBannerInfoBarDelegate::CreateForWebApp(
         service,
         this,
         web_app_data_.start_url);
   }
 
   if (weak_infobar_ptr_ != nullptr)
     banners::TrackDisplayEvent(DISPLAY_CREATED);
 }
 
 void AppBannerManager::OnDidRetrieveMetaTagContent(
     bool success,
     const std::string& tag_name,
     const std::string& tag_content,
     const GURL& expected_url) {
   DCHECK(web_contents());
   if (!success || tag_name != kBannerTag || validated_url_ != expected_url ||
       tag_content.size() >= chrome::kMaxMetaTagAttributeLength) {
     return;
   }
 
   banners::TrackDisplayEvent(DISPLAY_BANNER_REQUESTED);
 
-  RecordCouldShowBanner(tag_content);
-  if (!CheckIfShouldShow(tag_content))
-    return;
-
   // Send the info to the Java side to get info about the app.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
   if (jobj.is_null())
     return;
 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, expected_url.spec()));
   ScopedJavaLocalRef<jstring> jpackage(
       ConvertUTF8ToJavaString(env, tag_content));
@@ skipping 76 matching lines @@
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAppInstallAlerts);
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners