GMC: Only count click to go back to tabs as interactions

This CL updates the auto-dismiss logic to only count click-to-tabs as
interactions instead of counting when the tab is focused by any means.
The only reason we had it that way was to accommodate the
"pre-refactor" world where it wasn't feasible to always detect the
difference.

Bug: 1026079
Change-Id: I8806f64ade7019716413ef54c07693574f192dfc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937141Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719586}

chrome/browser/ui/global_media_controls/media_notification_service.cc

@@ -81,11 +81,6 @@ void MediaNotificationService::Session::WebContentsDestroyed() {
   owner_->RemoveItem(id_);
 }
 
-void MediaNotificationService::Session::OnWebContentsFocused(
-    content::RenderWidgetHost*) {
-  OnSessionInteractedWith();
-}
-
 void MediaNotificationService::Session::MediaSessionInfoChanged(
     media_session::mojom::MediaSessionInfoPtr session_info) {
   bool playing =
@@ -364,6 +359,8 @@ void MediaNotificationService::OnContainerClicked(const std::string& id) {
   if (it == sessions_.end())
     return;
 
+  it->second.OnSessionInteractedWith();
+
   content::WebContents* web_contents = it->second.web_contents();
   if (!web_contents)
     return;

chrome/browser/ui/global_media_controls/media_notification_service.h

@@ -134,7 +134,6 @@ class MediaNotificationService
 
     // content::WebContentsObserver implementation.
     void WebContentsDestroyed() override;
-    void OnWebContentsFocused(content::RenderWidgetHost*) override;
 
     // media_session::mojom::MediaControllerObserver:
     void MediaSessionInfoChanged(
@@ -163,10 +162,10 @@ class MediaNotificationService
     // called if the value has not already been set.
     void set_dismiss_reason(GlobalMediaControlsDismissReason reason);
 
-   private:
     // Called when a session is interacted with (to reset |inactive_timer_|).
     void OnSessionInteractedWith();
 
+   private:
     void StartInactiveTimer();
 
     void OnInactiveTimerFired();

chrome/browser/ui/global_media_controls/media_notification_service_unittest.cc

@@ -240,12 +240,6 @@ class MediaNotificationServiceTest : public testing::Test {
     item_itr->second.WebContentsDestroyed();
   }
 
-  void SimulateTabFocused(const base::UnguessableToken& id) {
-    auto item_itr = service_->sessions_.find(id.ToString());
-    EXPECT_NE(service_->sessions_.end(), item_itr);
-    item_itr->second.OnWebContentsFocused(nullptr);
-  }
-
   void SimulatePlaybackStateChanged(const base::UnguessableToken& id,
                                     bool playing) {
     MediaSessionInfoPtr session_info(MediaSessionInfo::New());
@@ -265,6 +259,10 @@ class MediaNotificationServiceTest : public testing::Test {
     item_itr->second.MediaSessionPositionChanged(base::nullopt);
   }
 
+  void SimulateNotificationClicked(const base::UnguessableToken& id) {
+    service_->OnContainerClicked(id.ToString());
+  }
+
   void SimulateDismissButtonClicked(const base::UnguessableToken& id) {
     service_->OnContainerDismissed(id.ToString());
   }
@@ -734,10 +732,10 @@ TEST_F(MediaNotificationServiceTest, DelaysHidingNotifications_Interactions) {
   AdvanceClockMinutes(59);
   EXPECT_TRUE(HasActiveNotifications());
 
-  // If the user goes back to the tab, it should reset the hide timer.
+  // If the user clicks to go back to the tab, it should reset the hide timer.
   ExpectHistogramInteractionDelayAfterPause(base::TimeDelta::FromMinutes(59),
                                             0);
-  SimulateTabFocused(id);
+  SimulateNotificationClicked(id);
   ExpectHistogramInteractionDelayAfterPause(base::TimeDelta::FromMinutes(59),
                                             1);
   AdvanceClockMinutes(50);