Windows: Fix AtExitManager assertions on shutdown when running with multi-threaded message loop (issue #1680)

2025-06-05 21:39:12 +02:00 · 2015-11-25 22:45:19 -05:00
parent 269aaa2c3c
commit 2a658c414b
3 changed files with 57 additions and 0 deletions
--- a/patch/patches/prefs_tab_helper_1680.patch
+++ b/patch/patches/prefs_tab_helper_1680.patch
@@ -0,0 +1,47 @@
+diff --git prefs_tab_helper.cc prefs_tab_helper.cc
+index 5cb2d6e..b0c8689 100644
+--- prefs_tab_helper.cc
+++ prefs_tab_helper.cc
+@@ -7,7 +7,7 @@
+ #include <set>
+ #include <string>
+ 
+-#include "base/memory/singleton.h"
+#include "base/lazy_instance.h"
+ #include "base/prefs/overlay_user_pref_store.h"
+ #include "base/prefs/pref_change_registrar.h"
+ #include "base/prefs/pref_service.h"
+@@ -413,12 +413,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
+         GetInstance()->GetServiceForBrowserContext(profile, true));
+   }
+ 
+-  static PrefWatcherFactory* GetInstance() {
+-    return base::Singleton<PrefWatcherFactory>::get();
+-  }
+  static PrefWatcherFactory* GetInstance();
+ 
+  private:
+-  friend struct base::DefaultSingletonTraits<PrefWatcherFactory>;
+  friend struct base::DefaultLazyInstanceTraits<PrefWatcherFactory>;
+ 
+   PrefWatcherFactory() : BrowserContextKeyedServiceFactory(
+       "PrefWatcher",
+@@ -439,6 +437,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory {
+   }
+ };
+ 
+namespace {
+
+base::LazyInstance<PrefWatcherFactory>::Leaky g_pref_watcher_factory =
+    LAZY_INSTANCE_INITIALIZER;
+
+}  // namespace
+
+// static
+PrefWatcherFactory* PrefWatcherFactory::GetInstance() {
+  return g_pref_watcher_factory.Pointer();
+}
+
+ // static
+ PrefWatcher* PrefWatcher::Get(Profile* profile) {
+   return PrefWatcherFactory::GetForProfile(profile);