Remove the app banner navigation heuristic.

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"
@@ skipping 53 matching lines @@
   return base::Time::Now() +
          base::TimeDelta::FromDays(gTimeDeltaInDaysForTesting);
 }
 
 // static
 void AppBannerManager::SetTimeDeltaForTesting(int days) {
   gTimeDeltaInDaysForTesting = days;
 }
 
 // static
-void AppBannerManager::SetEngagementWeights(double direct_engagement,
-                                            double indirect_engagement) {
-  AppBannerSettingsHelper::SetEngagementWeights(direct_engagement,
-                                                indirect_engagement);
+void AppBannerManager::SetTotalEngagementToTrigger(double engagement) {
+  AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
 }
 
 // static
 bool AppBannerManager::URLsAreForTheSamePage(const GURL& first,
                                              const GURL& second) {
   return first.GetWithEmptyPath() == second.GetWithEmptyPath() &&
          first.path_piece() == second.path_piece() &&
          first.query_piece() == second.query_piece();
 }
 
@@ skipping 267 matching lines @@
       binding_.CreateInterfacePtrAndBind(), mojo::GetProxy(&event_),
       {GetBannerType()},
       base::Bind(&AppBannerManager::OnBannerPromptReply, GetWeakPtr()));
 }
 
 void AppBannerManager::DidStartNavigation(content::NavigationHandle* handle) {
   if (!handle->IsInMainFrame() || handle->IsSamePage())
     return;
 
   load_finished_ = false;
-  if (AppBannerSettingsHelper::ShouldUseSiteEngagementScore() &&
-      GetSiteEngagementService() == nullptr) {
+  if (GetSiteEngagementService() == nullptr) {
     // Ensure that we are observing the site engagement service on navigation
     // start. This may be the first navigation, or we may have stopped
     // observing if the banner flow was triggered on the previous page.
     SiteEngagementObserver::Observe(SiteEngagementService::Get(
         Profile::FromBrowserContext(web_contents()->GetBrowserContext())));
   }
 }
 
 void AppBannerManager::DidFinishNavigation(content::NavigationHandle* handle) {
   if (handle->IsInMainFrame() && handle->HasCommitted() &&
       !handle->IsSamePage()) {
     last_transition_type_ = handle->GetPageTransition();

[pkotwicz, 2016/12/07 14:48:15]

Drive by: It looks like |last_transition_type_| can now be removed?

[dominickn, 2016/12/08 02:41:50]

Nice catch, done.

     active_media_players_.clear();
     if (is_active_)
       Stop();
   }
 }
 
 void AppBannerManager::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
   // Don't start the banner flow unless the main frame has finished loading.
   if (render_frame_host->GetParent())
     return;
 
   load_finished_ = true;
   validated_url_ = validated_url;
-  // Start the pipeline immediately if we aren't using engagement, or if 0
-  // engagement is required.
-  if (!AppBannerSettingsHelper::ShouldUseSiteEngagementScore() ||
-      banner_request_queued_ ||
+  // Start the pipeline immediately if 0 engagement is required or if we've
+  // queued a banner request.
+  if (banner_request_queued_ ||
       AppBannerSettingsHelper::HasSufficientEngagement(0)) {
     SiteEngagementObserver::Observe(nullptr);
     banner_request_queued_ = false;
 
     RequestAppBanner(validated_url, false /* is_debug_mode */);
   }
 }
 
 void AppBannerManager::MediaStartedPlaying(const MediaPlayerInfo& media_info,
                                            const MediaPlayerId& id) {
@@ skipping 32 matching lines @@
       // be safe to start this in response to user input.
       RequestAppBanner(url, false /* is_debug_mode */);
     }
   }
 }
 
 void AppBannerManager::RecordCouldShowBanner() {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
-  AppBannerSettingsHelper::RecordBannerCouldShowEvent(
+  AppBannerSettingsHelper::RecordBannerEvent(
       contents, validated_url_, GetAppIdentifier(),
-      GetCurrentTime(), last_transition_type_);
+      AppBannerSettingsHelper::APP_BANNER_EVENT_COULD_SHOW, GetCurrentTime());
 }
 
 bool AppBannerManager::CheckIfShouldShowBanner() {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
   InstallableStatusCode code = AppBannerSettingsHelper::ShouldShowBanner(
       contents, validated_url_, GetAppIdentifier(), GetCurrentTime());
   if (code == NO_ERROR_DETECTED)
     return true;
@@ skipping 76 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