Fix bug so that launcher search metrics session ends only if one is o…

…pen.

This can occur when switching from clamshell mode to tablet mode. It also occurs when clicking on any item in the launcher in tablet mode, as two end session requests are made.

This fix checks if a current session is open before logging a session end.

Test: Added unit tests, works on DUT
Bug: b/307812616
Change-Id: I45d3583c3973ba08f0479ec3f50cb4bbd1ceec30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4974802
Reviewed-by: Dmitry Grebenyuk <dgrebenyuk@google.com>
Commit-Queue: Lauren Commeignes <laurencom@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1216728}

chrome/browser/ash/app_list/search/search_session_metrics_manager.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/ash/app_list/search/search_session_metrics_manager.h"
 
 #include "ash/public/cpp/app_list/app_list_controller.h"
+#include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/strcat.h"
 #include "chrome/browser/ash/app_list/search/common/keyword_util.h"
@@ -51,6 +52,11 @@ void SearchSessionMetricsManager::OnSearchSessionStarted() {
 
 void SearchSessionMetricsManager::OnSearchSessionEnded(
     const std::u16string& query) {
+  if (!session_active_) {
+    LOG(ERROR) << "A request for a launcher search session to end has been "
+                  "made when there was no active session.";
+    return;
+  }
   EndSearchSession(query);
 }
 

chrome/browser/ash/app_list/search/search_session_metrics_manager_unittest.cc

@@ -137,6 +137,11 @@ TEST_F(SearchSessionMetricsManagerTest, AbandonResult) {
   histogram_tester()->ExpectTotalCount(SearchKeyHistogram, 1);
   histogram_tester()->ExpectUniqueSample(
       SearchKeyHistogram, ash::SearchSessionConclusion::kQuit, 1);
+
+  // No additional session should be logged if no session was started
+  metrics_manager()->OnSearchSessionEnded(u"");
+
+  histogram_tester()->ExpectTotalCount(SearchKeyHistogram, 1);
 }
 
 }  // namespace app_list::test