Make all site engagement tests run on Android.

chrome/browser/engagement/site_engagement_service_unittest.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/engagement/site_engagement_service.h"
 
 #include <utility>
 
-#include "base/command_line.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/engagement/site_engagement_helper.h"
 #include "chrome/browser/engagement/site_engagement_metrics.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/browser_with_test_window_test.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/test/test_history_database.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/page_navigator.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 base::FilePath g_temp_history_dir;
 
 const int kLessAccumulationsThanNeededToMaxDailyEngagement = 2;
 const int kMoreAccumulationsThanNeededToMaxDailyEngagement = 40;
 const int kMoreAccumulationsThanNeededToMaxTotalEngagement = 200;
 const int kLessDaysThanNeededToMaxTotalEngagement = 4;
@@ skipping 320 matching lines @@
 TEST_F(SiteEngagementScoreTest, PopulatedDictionary) {
   base::DictionaryValue dict;
   dict.SetDouble(SiteEngagementScore::kRawScoreKey, 1);
   dict.SetDouble(SiteEngagementScore::kPointsAddedTodayKey, 2);
   dict.SetDouble(SiteEngagementScore::kLastEngagementTimeKey,
                   GetReferenceTime().ToInternalValue());
 
   TestScoreInitializesAndUpdates(&dict, 1, 2, GetReferenceTime());
 }
 
-class SiteEngagementServiceTest : public BrowserWithTestWindowTest {
+class SiteEngagementServiceTest : public ChromeRenderViewHostTestHarness {
  public:
-  SiteEngagementServiceTest() {}
-
   void SetUp() override {
-    BrowserWithTestWindowTest::SetUp();
+    ChromeRenderViewHostTestHarness::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     g_temp_history_dir = temp_dir_.path();
     HistoryServiceFactory::GetInstance()->SetTestingFactory(
         profile(), &BuildTestHistoryService);
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(

[benwells, 2016/01/13 23:14:32]

How come the flag isn't needed?

[dominickn, 2016/01/14 01:17:41]

The service is normally kicked off in tab_helpers.cc, but this test runner
doesn't instantiate a browser or tabs. That makes the flag meaningless here -
GetForProfile just creates the service when called.

There should be separate browser tests (one for desktop and one for Android)
which turn the flag on and check that everything is working.

-        switches::kEnableSiteEngagementService);
   }
 
   void NavigateWithTransitionAndExpectHigherScore(
       SiteEngagementService* service,
-      GURL& url,
+      const GURL& url,
       ui::PageTransition transition) {
     double prev_score = service->GetScore(url);
-    content::NavigationController* controller =
-        &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
-
-    browser()->OpenURL(content::OpenURLParams(url, content::Referrer(),
-                                              CURRENT_TAB, transition, false));
-    CommitPendingLoad(controller);
+    controller().LoadURL(url, content::Referrer(), transition, std::string());
+    int pending_id = controller().GetPendingEntry()->GetUniqueID();
+    content::WebContentsTester::For(web_contents())
+        ->TestDidNavigate(web_contents()->GetMainFrame(), 1, pending_id, true,
+                          url, transition);
     EXPECT_LT(prev_score, service->GetScore(url));
   }
 
   void NavigateWithTransitionAndExpectEqualScore(
       SiteEngagementService* service,
       GURL& url,

[benwells, 2016/01/13 23:14:32]

Nit: Should this be const& as well?

[dominickn, 2016/01/14 01:17:41]

Done.

       ui::PageTransition transition) {
     double prev_score = service->GetScore(url);
-    content::NavigationController* controller =
-        &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
-
-    browser()->OpenURL(content::OpenURLParams(url, content::Referrer(),
-                                              CURRENT_TAB, transition, false));
-    CommitPendingLoad(controller);
+    controller().LoadURL(url, content::Referrer(), transition, std::string());
+    int pending_id = controller().GetPendingEntry()->GetUniqueID();
+    content::WebContentsTester::For(web_contents())
+        ->TestDidNavigate(web_contents()->GetMainFrame(), 1, pending_id, true,
+                          url, transition);
     EXPECT_EQ(prev_score, service->GetScore(url));
   }
 
  private:
   base::ScopedTempDir temp_dir_;
 };
 
 TEST_F(SiteEngagementServiceTest, GetMedianEngagement) {
   SiteEngagementService* service =
       SiteEngagementServiceFactory::GetForProfile(profile());
@@ skipping 59 matching lines @@
 }
 
 // Tests that the Site Engagement service is hooked up properly to navigations
 // by performing two navigations and checking the engagement score increases
 // both times.
 TEST_F(SiteEngagementServiceTest, ScoreIncrementsOnPageRequest) {
   SiteEngagementService* service =
       SiteEngagementServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(service);
 
+  // Create the helper manually since it isn't present when a tab isn't created.
+  SiteEngagementHelper::CreateForWebContents(web_contents());
+
   GURL url("http://www.google.com/");
   EXPECT_EQ(0, service->GetScore(url));
-  AddTab(browser(), GURL("about:blank"));
-
   NavigateWithTransitionAndExpectHigherScore(service, url,
                                              ui::PAGE_TRANSITION_TYPED);
-
   NavigateWithTransitionAndExpectHigherScore(service, url,
                                              ui::PAGE_TRANSITION_AUTO_BOOKMARK);
 }
 
 // Expect that site engagement scores for several sites are correctly
 // aggregated during navigation events.
 TEST_F(SiteEngagementServiceTest, GetTotalNavigationPoints) {
   SiteEngagementService* service =
       SiteEngagementServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(service);
@@ skipping 317 matching lines @@
 
     service->CleanupEngagementScores();
 
     score_map = service->GetScoreMap();
     EXPECT_EQ(0u, score_map.size());
     EXPECT_EQ(0, service->GetScore(url1));
   }
 }
 
 TEST_F(SiteEngagementServiceTest, NavigationAccumulation) {
-  AddTab(browser(), GURL("about:blank"));
   GURL url("https://www.google.com/");
 
   SiteEngagementService* service =
-    SiteEngagementServiceFactory::GetForProfile(browser()->profile());
+      SiteEngagementServiceFactory::GetForProfile(profile());
   ASSERT_TRUE(service);
 
+  // Create the helper manually since it isn't present when a tab isn't created.
+  SiteEngagementHelper::CreateForWebContents(web_contents());
+
   // Only direct navigation should trigger engagement.
   NavigateWithTransitionAndExpectHigherScore(service, url,
                                              ui::PAGE_TRANSITION_TYPED);
   NavigateWithTransitionAndExpectHigherScore(service, url,
                                              ui::PAGE_TRANSITION_GENERATED);
   NavigateWithTransitionAndExpectHigherScore(service, url,
                                              ui::PAGE_TRANSITION_AUTO_BOOKMARK);
   NavigateWithTransitionAndExpectHigherScore(
       service, url, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
 
@@ skipping 75 matching lines @@
                            &task_tracker);
     waiter.Wait();
 
     // Only origin3 remains.
     EXPECT_EQ(0, engagement->GetScore(origin1));
     EXPECT_EQ(0, engagement->GetScore(origin2));
     EXPECT_EQ(5.0, engagement->GetScore(origin3));
     EXPECT_EQ(5.0, engagement->GetTotalEngagementPoints());
   }
 }