[M54] Merge DesktopEngagementService fixes.

chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc

Index: chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc
diff --git a/chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc b/chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc
index fcd72072ec2c82120767b5f5fe32cb5d8c54cdd1..ac56e720529d71a386a90d11ef4f40588abcc5f6 100644
--- a/chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc
+++ b/chrome/browser/metrics/desktop_engagement/chrome_visibility_observer.cc
@@ -14,6 +14,13 @@
 
 namespace metrics {
 
+namespace {
+
+const base::TimeDelta kZeroTime = base::TimeDelta::FromSeconds(0);
+
+}  // namespace
+
+
 ChromeVisibilityObserver::ChromeVisibilityObserver() : weak_factory_(this) {
   BrowserList::AddObserver(this);
   InitVisibilityGapTimeout();
@@ -23,8 +30,10 @@ ChromeVisibilityObserver::~ChromeVisibilityObserver() {
   BrowserList::RemoveObserver(this);
 }
 
-void ChromeVisibilityObserver::SendVisibilityChangeEvent(bool active) {
-  DesktopEngagementService::Get()->OnVisibilityChanged(active);
+void ChromeVisibilityObserver::SendVisibilityChangeEvent(
+    bool active,
+    base::TimeDelta time_ago) {
+  DesktopEngagementService::Get()->OnVisibilityChanged(active, time_ago);
 }
 
 void ChromeVisibilityObserver::CancelVisibilityChange() {
@@ -35,14 +44,14 @@ void ChromeVisibilityObserver::OnBrowserSetLastActive(Browser* browser) {
   if (weak_factory_.HasWeakPtrs())
     CancelVisibilityChange();
   else
-    SendVisibilityChangeEvent(true);
+    SendVisibilityChangeEvent(true, kZeroTime);
 }
 
 void ChromeVisibilityObserver::OnBrowserNoLongerActive(Browser* browser) {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ChromeVisibilityObserver::SendVisibilityChangeEvent,
-                 weak_factory_.GetWeakPtr(), false),
+                 weak_factory_.GetWeakPtr(), false, visibility_gap_timeout_),
       visibility_gap_timeout_);
 }
 
@@ -51,7 +60,7 @@ void ChromeVisibilityObserver::OnBrowserRemoved(Browser* browser) {
   // is not visible anymore immediately without waiting.
   if (BrowserList::GetInstance()->empty()) {
     CancelVisibilityChange();
-    SendVisibilityChangeEvent(false);
+    SendVisibilityChangeEvent(false, kZeroTime);
   }
 }