Remove window count metrics.

WindowCount metrics are used to record how many windows have been
created when the user takes action on the full restore notification, to
provide the user usage data to help make the ui decision. Full restore
has launched in M94, and we have got the new ui review decision. So
WindowCount metrics can be removed.

BUG=1146900

Change-Id: Ifb4c19af2f078a27e05ae883b484102fb0a3b8f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3216775
Reviewed-by: Sammie Quon <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Nancy Wang <[email protected]>
Cr-Commit-Position: refs/heads/main@{#930211}

Author: Nancy Wang

chrome/browser/ash/app_restore/full_restore_service.cc

@@ -50,12 +50,6 @@ const char kRestoreForCrashNotificationHistogramName[] =
 const char kRestoreSettingHistogramName[] = "Apps.RestoreSetting";
 const char kRestoreInitSettingHistogramName[] = "Apps.RestoreInitSetting";
 
-constexpr char kWindowCountHistogramPrefix[] = "Apps.WindowCount.";
-constexpr char kRestoreHistogramSuffix[] = "Restore";
-constexpr char kNotRestoreHistogramSuffix[] = "NotRestore";
-constexpr char kCloseByUserHistogramSuffix[] = "CloseByUser";
-constexpr char kCloseNotByUserHistogramSuffix[] = "CloseNotByUser";
-
 // static
 FullRestoreService* FullRestoreService::GetForProfile(Profile* profile) {
   return static_cast<FullRestoreService*>(
@@ -221,8 +215,6 @@ void FullRestoreService::Close(bool by_user) {
     RecordRestoreAction(
         notification_->id(),
         by_user ? RestoreAction::kCloseByUser : RestoreAction::kCloseNotByUser);
-    RecordWindowCount(by_user ? kCloseByUserHistogramSuffix
-                              : kCloseNotByUserHistogramSuffix);
   }
   notification_ = nullptr;
 
@@ -247,7 +239,6 @@ void FullRestoreService::Click(const absl::optional<int>& button_index,
 
     // Restore if the user clicks the notification body.
     RecordRestoreAction(notification_->id(), RestoreAction::kRestore);
-    RecordWindowCount(kRestoreHistogramSuffix);
     Restore();
 
     // If the user selects restore, don't start the save timer. Wait for the
@@ -270,7 +261,6 @@ void FullRestoreService::Click(const absl::optional<int>& button_index,
   // Close the crash notification if the user clicks the cancel button of the
   // crash notification.
   RecordRestoreAction(notification_->id(), RestoreAction::kCancel);
-  RecordWindowCount(kNotRestoreHistogramSuffix);
   MaybeCloseNotification();
 }
 
@@ -456,12 +446,6 @@ bool FullRestoreService::ShouldShowNotification() {
          !::first_run::IsChromeFirstRun() && !close_notification_;
 }
 
-void FullRestoreService::RecordWindowCount(const std::string& restore_action) {
-  base::UmaHistogramCounts100(
-      kWindowCountHistogramPrefix + restore_action,
-      ::full_restore::FullRestoreSaveHandler::GetInstance()->window_count());
-}
-
 ScopedRestoreForTesting::ScopedRestoreForTesting() {
   g_restore_for_testing = false;
 }

chrome/browser/ash/app_restore/full_restore_service.h

@@ -126,10 +126,6 @@ class FullRestoreService : public KeyedService,
   // Chrome is run. Otherwise, returns false.
   bool ShouldShowNotification();
 
-  // Records the new window count when the user takes action on the full restore
-  // notification.
-  void RecordWindowCount(const std::string& restore_action);
-
   Profile* profile_ = nullptr;
   PrefChangeRegistrar pref_change_registrar_;
 

components/app_restore/full_restore_save_handler.cc

@@ -107,15 +107,13 @@ void FullRestoreSaveHandler::OnWindowInitialized(aura::Window* window) {
     if (arc_save_handler_)
       arc_save_handler_->OnWindowInitialized(window);
 
-    ++window_count_;
     return;
   }
 
   int32_t window_id = window->GetProperty(app_restore::kWindowIdKey);
   if (!SessionID::IsValidValue(window_id))
     return;
 
-  ++window_count_;
   observed_windows_.AddObservation(window);
 
   std::string* app_id_str = window->GetProperty(app_restore::kAppIdKey);

components/app_restore/full_restore_save_handler.h

@@ -170,8 +170,6 @@ class COMPONENT_EXPORT(APP_RESTORE) FullRestoreSaveHandler
   // the window's associated AppRestoreData.
   std::string GetAppId(aura::Window* window);
 
-  int window_count() const { return window_count_; }
-
   base::OneShotTimer* GetTimerForTesting() { return &save_timer_; }
 
   // Since this is a singleton, tests may need to clear it between tests.
@@ -281,9 +279,6 @@ class COMPONENT_EXPORT(APP_RESTORE) FullRestoreSaveHandler
   // permit `save_timer_` to start periodically triggering saving to disk.
   bool allow_save_ = false;
 
-  // The number of window created. This is used for metrics only.
-  int window_count_ = 0;
-
   base::ScopedObservation<aura::Env, aura::EnvObserver> env_observer_{this};
 
   base::ScopedMultiSourceObservation<aura::Window, aura::WindowObserver>

tools/metrics/histograms/metadata/apps/histograms.xml

@@ -141,11 +141,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <variants name="RestoreAction">
   <variant name="CloseByUser"
-      summary="The full restore notfication is closed by user"/>
+      summary="The full restore notfication is closed by user">
+    <obsolete>
+      Removed October 2021.
+    </obsolete>
+  </variant>
   <variant name="CloseNotByUser"
-      summary="The full restore notfication is not closed by user"/>
-  <variant name="NotRestore" summary="No thanks is clicked"/>
-  <variant name="Restore" summary="Restore is clicked"/>
+      summary="The full restore notfication is not closed by user">
+    <obsolete>
+      Removed October 2021.
+    </obsolete>
+  </variant>
+  <variant name="NotRestore" summary="No thanks is clicked">
+    <obsolete>
+      Removed October 2021.
+    </obsolete>
+  </variant>
+  <variant name="Restore" summary="Restore is clicked">
+    <obsolete>
+      Removed October 2021.
+    </obsolete>
+  </variant>
 </variants>
 
 <histogram name="Apps.ActivatedCount.{AppType}" units="units"
@@ -2822,6 +2838,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.WindowCount.{RestoreAction}" units="unit"
     expires_after="2021-12-30">
+  <obsolete>
+    Removed October 2021.
+  </obsolete>
   <owner>[email protected]</owner>
   <owner>[email protected]</owner>
   <summary>