Update app banner state machine to use more states.

chrome/browser/banners/app_banner_manager_browsertest.cc

 // Copyright 2016 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 <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 36 matching lines @@
     if (validated_url == GURL("about:blank"))
       return;
 
     AppBannerManager::RequestAppBanner(validated_url, is_debug_mode);
   }
 
   bool will_show() { return will_show_.get() && *will_show_; }
 
   void clear_will_show() { will_show_.reset(); }
 
-  bool is_active_or_pending() {
-    return AppBannerManager::is_active_or_pending();
-  }
+  bool is_inactive() { return AppBannerManager::is_inactive(); }
 
   bool is_complete() { return AppBannerManager::is_complete(); }
 
   bool is_pending_engagement() {
     return AppBannerManager::is_pending_engagement();
   }
 
   bool need_to_log_status() { return need_to_log_status_; }
 
   void Prepare(base::Closure quit_closure) {
@@ skipping 103 matching lines @@
     // pipeline to trigger on the last one; otherwise, nothing is expected to
     // happen.
     int iterations = 0;
     SiteEngagementService* service =
         SiteEngagementService::Get(browser->profile());
     for (double engagement : engagement_scores) {
       if (iterations > 0) {
         ui_test_utils::NavigateToURL(browser, test_url);
 
         EXPECT_FALSE(manager->will_show());
-        EXPECT_FALSE(manager->is_active_or_pending());
+        EXPECT_TRUE(manager->is_inactive());
 
         histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
         histograms.ExpectTotalCount(banners::kInstallableStatusCodeHistogram,
                                     0);
       }
       service->ResetBaseScoreForURL(test_url, engagement);
       ++iterations;
     }
 
     // On the final loop, we expect the banner pipeline to trigger - the
     // navigation should generate the final engagement to show the banner. Spin
     // the run loop and wait for the manager to finish.
     base::RunLoop run_loop;
     manager->clear_will_show();
     manager->Prepare(run_loop.QuitClosure());
     chrome::NavigateParams nav_params(browser, test_url, transition);
     ui_test_utils::NavigateToURL(&nav_params);
     run_loop.Run();
 
     EXPECT_EQ(expected_to_show, manager->will_show());
-    EXPECT_FALSE(manager->is_active_or_pending());
+
+    // Generally the manager will be in the complete state, however some test
+    // cases navigate the page, causing the state to go back to INACTIVE.
+    EXPECT_TRUE(manager->is_complete() || manager->is_inactive());
 
     // Check the tab title; this allows the test page to send data back out to
     // be inspected by the test case.
     if (!expected_tab_title.empty()) {
       base::string16 title;
       EXPECT_TRUE(ui_test_utils::GetCurrentTabTitle(browser, &title));
       EXPECT_EQ(expected_tab_title, title);
     }
 
     // If in incognito, ensure that nothing is recorded.
@@ skipping 260 matching lines @@
     base::RunLoop run_loop;
     manager->clear_will_show();
     manager->Prepare(run_loop.QuitClosure());
     service->HandleNavigation(
         browser()->tab_strip_model()->GetActiveWebContents(),
         ui::PageTransition::PAGE_TRANSITION_TYPED);
     run_loop.Run();
   }
 
   EXPECT_TRUE(manager->will_show());
-  EXPECT_FALSE(manager->is_active_or_pending());
   EXPECT_FALSE(manager->need_to_log_status());
   EXPECT_TRUE(manager->is_complete());
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 1);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
                                 SHOWING_WEB_APP_BANNER, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(AppBannerManagerBrowserTest, CheckOnLoadThenNavigate) {
   base::test::ScopedFeatureList feature_list;
@@ skipping 23 matching lines @@
   // Navigate and expect Stop() to be called.
   {
     base::RunLoop run_loop;
     manager->clear_will_show();
     manager->Prepare(run_loop.QuitClosure());
     ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
     run_loop.Run();
   }
 
   EXPECT_FALSE(manager->will_show());
-  EXPECT_FALSE(manager->is_active_or_pending());
+  EXPECT_TRUE(manager->is_inactive());
   EXPECT_FALSE(manager->need_to_log_status());
 
   histograms.ExpectTotalCount(banners::kMinutesHistogram, 0);
   histograms.ExpectUniqueSample(banners::kInstallableStatusCodeHistogram,
                                 INSUFFICIENT_ENGAGEMENT, 1);
 }
 
 }  // namespace banners