[Windows] Fix "dr" tracking

r1202869 inadvertently removed the call to OnBrowserLaunch during normal browser startup. The only remaining use for this function was to create the browser's DidRunUpdater for normal launches. As a consequence, post-launch "dr" tracking did not happen until the first rendezvous. This change fixes "dr" tracking by moving creation of the browser's DidRunUpdater back into ChromeBrowserMainPartsWin, where it lived until r479139. This is now possible as a result of removal of the toast in r1205320. Fixed: 1516887 Change-Id: I5b2852886e4721f7ccc01f9edb3f09d964362958 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5177018 Reviewed-by: Avi Drissman <avi@chromium.org> Commit-Queue: Avi Drissman <avi@chromium.org> Auto-Submit: Greg Thompson <grt@chromium.org> Cr-Commit-Position: refs/heads/main@{#1244787}
youtube · Jan 9, 2024 · a8be832 · a8be832
1 parent ce80985
commit a8be832
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 63 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -5858,8 +5858,6 @@ static_library("browser") {
       "accessibility/caption_settings_dialog_win.cc",
       "badging/badge_manager_delegate_win.cc",
       "badging/badge_manager_delegate_win.h",
-      "browser_process_platform_part_win.cc",
-      "browser_process_platform_part_win.h",
       "browser_switcher/browser_switcher_policy_migrator.cc",
       "browser_switcher/browser_switcher_policy_migrator.h",
       "browser_switcher/browser_switcher_service_win.cc",

diff --git a/chrome/browser/browser_process_platform_part.h b/chrome/browser/browser_process_platform_part.h
@@ -18,8 +18,6 @@
 class BrowserProcessPlatformPart : public BrowserProcessPlatformPartChromeOS {};
 #elif BUILDFLAG(IS_MAC)
 #include "chrome/browser/browser_process_platform_part_mac.h"  // IWYU pragma: export
-#elif BUILDFLAG(IS_WIN)
-#include "chrome/browser/browser_process_platform_part_win.h"  // IWYU pragma: export
 #else
 #include "chrome/browser/browser_process_platform_part_base.h"  // IWYU pragma: export
 class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {};

diff --git a/chrome/browser/browser_process_platform_part_base.cc b/chrome/browser/browser_process_platform_part_base.cc
@@ -17,10 +17,6 @@ BrowserProcessPlatformPartBase::BrowserProcessPlatformPartBase() {
 BrowserProcessPlatformPartBase::~BrowserProcessPlatformPartBase() {
 }
 
-#if BUILDFLAG(ENABLE_PROCESS_SINGLETON)
-void BrowserProcessPlatformPartBase::OnBrowserLaunch() {}
-#endif
-
 void BrowserProcessPlatformPartBase::StartTearDown() {
 }
 

diff --git a/chrome/browser/browser_process_platform_part_base.h b/chrome/browser/browser_process_platform_part_base.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_BASE_H_
 #define CHROME_BROWSER_BROWSER_PROCESS_PLATFORM_PART_BASE_H_
 
-#include "chrome/browser/buildflags.h"
-
 // A base class for platform-specific BrowserProcessPlatformPart
 // implementations. This class itself should never be used verbatim.
 class BrowserProcessPlatformPartBase {
@@ -20,12 +18,6 @@ class BrowserProcessPlatformPartBase {
 
   virtual ~BrowserProcessPlatformPartBase();
 
-#if BUILDFLAG(ENABLE_PROCESS_SINGLETON)
-  // Called after launch, whether it is from creating a new process or after
-  // rendezvous to an existing process via the process singleton.
-  virtual void OnBrowserLaunch();
-#endif
-
   // Called in the middle of BrowserProcessImpl::StartTearDown().
   virtual void StartTearDown();
 

diff --git a/chrome/browser/browser_process_platform_part_win.cc b/chrome/browser/browser_process_platform_part_win.cc
diff --git a/chrome/browser/browser_process_platform_part_win.h b/chrome/browser/browser_process_platform_part_win.h
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
@@ -514,8 +514,6 @@ void ProcessSingletonNotificationCallbackImpl(
   }
 #endif
 
-  g_browser_process->platform_part()->OnBrowserLaunch();
-
   StartupProfilePathInfo startup_profile_path_info =
       GetStartupProfilePath(current_directory, command_line,
                             /*ignore_profile_picker=*/false);

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
@@ -45,6 +45,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
+#include "chrome/browser/active_use_util.h"
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enterprise/browser_management/management_service_factory.h"
@@ -545,6 +546,12 @@ void ChromeBrowserMainPartsWin::PostBrowserStart() {
 
   InitializeChromeElf();
 
+#if BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION)
+  if constexpr (kShouldRecordActiveUse) {
+    did_run_updater_.emplace();
+  }
+#endif
+
   // Query feature first, to include full population in field trial.
   if (base::FeatureList::IsEnabled(features::kAppBoundEncryptionMetrics) &&
       install_static::IsSystemInstall()) {

diff --git a/chrome/browser/chrome_browser_main_win.h b/chrome/browser/chrome_browser_main_win.h
@@ -11,6 +11,13 @@
 
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/common/conflicts/module_watcher_win.h"
+#include "chrome/install_static/buildflags.h"
+
+#if BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION)
+#include <optional>
+
+#include "chrome/browser/google/did_run_updater_win.h"
+#endif
 
 class PlatformAuthPolicyObserver;
 
@@ -82,6 +89,11 @@ class ChromeBrowserMainPartsWin : public ChromeBrowserMainParts {
   void OnModuleEvent(const ModuleWatcher::ModuleEvent& event);
   void SetupModuleDatabase(std::unique_ptr<ModuleWatcher>* module_watcher);
 
+#if BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION)
+  // Updates Chrome's "did run" state periodically when the process is in use.
+  std::optional<DidRunUpdater> did_run_updater_;
+#endif
+
   // Watches module load events and forwards them to the ModuleDatabase.
   std::unique_ptr<ModuleWatcher> module_watcher_;