[chromecast] Replace base::LazyInstance

Bug: b/78599329
Test: build cast_shell
Change-Id: I87afd8567613295860bc16a0e1c664a3ec4ee1a4
Reviewed-on: https://chromium-review.googlesource.com/1058596
Commit-Queue: Yuanyao Zhong <yyzhong@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558757}

chromecast/app/cast_main_delegate.cc

@@ -13,8 +13,8 @@
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/no_destructor.h"
 #include "base/path_service.h"
 #include "base/posix/global_descriptors.h"
 #include "build/build_config.h"
@@ -43,8 +43,11 @@
 namespace {
 
 #if defined(OS_LINUX)
-base::LazyInstance<chromecast::CastCrashReporterClient>::Leaky
-    g_crash_reporter_client = LAZY_INSTANCE_INITIALIZER;
+chromecast::CastCrashReporterClient* GetCastCrashReporter() {
+  static base::NoDestructor<chromecast::CastCrashReporterClient>
+      crash_reporter_client;
+  return crash_reporter_client.get();
+}
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_ANDROID)
@@ -145,7 +148,7 @@ void CastMainDelegate::PreSandboxStartup() {
   base::PathService::Get(FILE_CAST_ANDROID_LOG, &log_file);
   chromecast::CrashHandler::Initialize(process_type, log_file);
 #elif defined(OS_LINUX)
-  crash_reporter::SetCrashReporterClient(g_crash_reporter_client.Pointer());
+  crash_reporter::SetCrashReporterClient(GetCastCrashReporter());
 
   if (process_type != switches::kZygoteProcess) {
     CastCrashReporterClient::InitCrashReporter(process_type);

chromecast/base/cast_features.cc

@@ -9,7 +9,6 @@
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/field_trial_param_associator.h"
 #include "base/metrics/field_trial_params.h"
@@ -25,14 +24,18 @@ const base::FieldTrial::Probability k100PercentProbability = 100;
 // The name of the default group to use for Cast DCS features.
 const char kDefaultDCSFeaturesGroup[] = "default_dcs_features_group";
 
-base::LazyInstance<std::unordered_set<int32_t>>::Leaky g_experiment_ids =
-    LAZY_INSTANCE_INITIALIZER;
+std::unordered_set<int32_t>& GetExperimentIds() {
+  static base::NoDestructor<std::unordered_set<int32_t>> g_experiment_ids;
+  return *g_experiment_ids;
+}
+
 bool g_experiment_ids_initialized = false;
 
 // The collection of features that have been registered by unit tests
 std::vector<const base::Feature*>& GetTestFeatures() {
-  static base::NoDestructor<std::vector<const base::Feature*>> g_features_for_test;
-  return *g_features_for_test;
+  static base::NoDestructor<std::vector<const base::Feature*>>
+      features_for_test;
+  return *features_for_test;
 }
 
 void SetExperimentIds(const base::ListValue& list) {
@@ -46,7 +49,7 @@ void SetExperimentIds(const base::ListValue& list) {
       LOG(ERROR) << "Non-integer value found in experiment id list!";
     }
   }
-  g_experiment_ids.Get().swap(ids);
+  GetExperimentIds().swap(ids);
   g_experiment_ids_initialized = true;
 }
 
@@ -318,7 +321,7 @@ base::DictionaryValue GetOverriddenFeaturesForStorage(
 
 const std::unordered_set<int32_t>& GetDCSExperimentIds() {
   DCHECK(g_experiment_ids_initialized);
-  return g_experiment_ids.Get();
+  return GetExperimentIds();
 }
 
 void ResetCastFeaturesForTesting() {

chromecast/base/chromecast_config_android.cc

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/android/jni_android.h"
-#include "base/lazy_instance.h"
 #include "jni/ChromecastConfigAndroid_jni.h"
 
 using base::android::JavaParamRef;
@@ -15,14 +14,10 @@ using base::android::JavaParamRef;
 namespace chromecast {
 namespace android {
 
-namespace {
-base::LazyInstance<ChromecastConfigAndroid>::DestructorAtExit g_instance =
-    LAZY_INSTANCE_INITIALIZER;
-}  // namespace
-
 // static
 ChromecastConfigAndroid* ChromecastConfigAndroid::GetInstance() {
-  return g_instance.Pointer();
+  static base::NoDestructor<ChromecastConfigAndroid> instance;
+  return instance.get();
 }
 
 ChromecastConfigAndroid::ChromecastConfigAndroid() {

chromecast/base/chromecast_config_android.h

@@ -8,8 +8,8 @@
 #include <jni.h>
 
 #include "base/callback.h"
-#include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/no_destructor.h"
 
 namespace chromecast {
 namespace android {
@@ -31,7 +31,7 @@ class ChromecastConfigAndroid {
   void RunSendUsageStatsChangedCallback(bool enabled);
 
  private:
-  friend struct base::LazyInstanceTraitsBase<ChromecastConfigAndroid>;
+  friend class base::NoDestructor<ChromecastConfigAndroid>;
 
   ChromecastConfigAndroid();
   ~ChromecastConfigAndroid();

chromecast/base/metrics/grouped_histogram.cc

@@ -7,11 +7,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
+#include "base/no_destructor.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
@@ -30,12 +30,14 @@ struct CurrentAppNameWithLock {
   std::string app_name;
 };
 
-base::LazyInstance<CurrentAppNameWithLock>::DestructorAtExit g_current_app =
-    LAZY_INSTANCE_INITIALIZER;
+CurrentAppNameWithLock& GetCurrentApp() {
+  static base::NoDestructor<CurrentAppNameWithLock> current_app;
+  return *current_app;
+}
 
 std::string GetAppName() {
-  base::AutoLock lock(g_current_app.Get().lock);
-  const std::string& app_name = g_current_app.Get().app_name;
+  base::AutoLock lock(GetCurrentApp().lock);
+  const std::string& app_name = GetCurrentApp().app_name;
   return app_name.empty() ? kAppNameErrorNoApp : app_name;
 }
 
@@ -177,8 +179,8 @@ void PreregisterAllGroupedHistograms() {
 }
 
 void TagAppStartForGroupedHistograms(const std::string& app_name) {
-  base::AutoLock lock(g_current_app.Get().lock);
-  g_current_app.Get().app_name = app_name;
+  base::AutoLock lock(GetCurrentApp().lock);
+  GetCurrentApp().app_name = app_name;
 }
 
 } // namespace metrics

chromecast/browser/extensions/cast_extension_host_delegate.cc

@@ -4,8 +4,8 @@
 
 #include "chromecast/browser/extensions/cast_extension_host_delegate.h"
 
-#include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/no_destructor.h"
 #include "chromecast/browser/extensions/cast_extension_web_contents_observer.h"
 #include "extensions/browser/media_capture_util.h"
 #include "extensions/browser/serial_extension_host_queue.h"
@@ -57,11 +57,9 @@ bool CastExtensionHostDelegate::CheckMediaAccessPermission(
   return media_capture_util::CheckMediaAccessPermission(type, extension);
 }
 
-static base::LazyInstance<SerialExtensionHostQueue>::DestructorAtExit g_queue =
-    LAZY_INSTANCE_INITIALIZER;
-
 ExtensionHostQueue* CastExtensionHostDelegate::GetExtensionHostQueue() const {
-  return g_queue.Pointer();
+  static base::NoDestructor<SerialExtensionHostQueue> queue;
+  return queue.get();
 }
 
 }  // namespace extensions

chromecast/common/cast_extensions_client.cc

@@ -7,9 +7,9 @@
 #include <memory>
 #include <string>
 
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/no_destructor.h"
 #include "chromecast/common/extensions_api/cast_aliases.h"
 #include "chromecast/common/extensions_api/cast_api_features.h"
 #include "chromecast/common/extensions_api/cast_api_permissions.h"
@@ -79,9 +79,6 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
   DISALLOW_COPY_AND_ASSIGN(ShellPermissionMessageProvider);
 };
 
-base::LazyInstance<ShellPermissionMessageProvider>::DestructorAtExit
-    g_permission_message_provider = LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 CastExtensionsClient::CastExtensionsClient()
@@ -109,7 +106,9 @@ void CastExtensionsClient::InitializeWebStoreUrls(
 const PermissionMessageProvider&
 CastExtensionsClient::GetPermissionMessageProvider() const {
   NOTIMPLEMENTED();
-  return g_permission_message_provider.Get();
+  static base::NoDestructor<ShellPermissionMessageProvider>
+      g_permission_message_provider;
+  return *g_permission_message_provider;
 }
 
 const std::string CastExtensionsClient::GetProductName() {

chromecast/crash/app_state_tracker.cc

@@ -4,7 +4,7 @@
 
 #include "chromecast/crash/app_state_tracker.h"
 
-#include "base/lazy_instance.h"
+#include "base/no_destructor.h"
 #include "chromecast/crash/cast_crash_keys.h"
 #include "components/crash/core/common/crash_key.h"
 
@@ -16,11 +16,9 @@ struct CurrentAppState {
   std::string last_launched_app;
 };
 
-base::LazyInstance<CurrentAppState>::DestructorAtExit g_app_state =
-    LAZY_INSTANCE_INITIALIZER;
-
 CurrentAppState* GetAppState() {
-  return g_app_state.Pointer();
+  static base::NoDestructor<CurrentAppState> app_state;
+  return app_state.get();
 }
 
 }  // namespace

chromecast/media/cma/backend/android/audio_sink_manager.cc

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "base/lazy_instance.h"
+#include "base/no_destructor.h"
 #include "chromecast/media/cma/backend/android/audio_sink_android.h"
 
 namespace chromecast {
@@ -23,14 +23,12 @@ class AudioSinkManagerInstance : public AudioSinkManager {
   DISALLOW_COPY_AND_ASSIGN(AudioSinkManagerInstance);
 };
 
-base::LazyInstance<AudioSinkManagerInstance>::DestructorAtExit
-    g_sink_manager_instance = LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 // static
 AudioSinkManager* AudioSinkManager::Get() {
-  return g_sink_manager_instance.Pointer();
+  base::NoDestructor<AudioSinkManagerInstance> sink_manager_instance;
+  return sink_manager_instance.get();
 }
 
 // static

chromecast/media/cma/backend/android/volume_control_android.cc

@@ -14,11 +14,11 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
-#include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
+#include "base/no_destructor.h"
 #include "chromecast/base/init_command_line_shlib.h"
 #include "chromecast/base/serializers.h"
 #include "chromecast/chromecast_buildflags.h"
@@ -68,8 +68,10 @@ float MapIntoDifferentVolumeTableDomain(AudioContentType from_type,
 
 }  // namespace
 
-base::LazyInstance<VolumeControlAndroid>::Leaky g_volume_control =
-    LAZY_INSTANCE_INITIALIZER;
+VolumeControlAndroid& GetVolumeControl() {
+  static base::NoDestructor<VolumeControlAndroid> volume_control;
+  return *volume_control;
+}
 
 VolumeControlAndroid::VolumeControlAndroid()
     : thread_("VolumeControl"),
@@ -319,37 +321,37 @@ void VolumeControl::Finalize() {
 
 // static
 void VolumeControl::AddVolumeObserver(VolumeObserver* observer) {
-  g_volume_control.Get().AddVolumeObserver(observer);
+  GetVolumeControl().AddVolumeObserver(observer);
 }
 
 // static
 void VolumeControl::RemoveVolumeObserver(VolumeObserver* observer) {
-  g_volume_control.Get().RemoveVolumeObserver(observer);
+  GetVolumeControl().RemoveVolumeObserver(observer);
 }
 
 // static
 float VolumeControl::GetVolume(AudioContentType type) {
-  return g_volume_control.Get().GetVolume(type);
+  return GetVolumeControl().GetVolume(type);
 }
 
 // static
 void VolumeControl::SetVolume(AudioContentType type, float level) {
-  g_volume_control.Get().SetVolume(type, level);
+  GetVolumeControl().SetVolume(type, level);
 }
 
 // static
 bool VolumeControl::IsMuted(AudioContentType type) {
-  return g_volume_control.Get().IsMuted(type);
+  return GetVolumeControl().IsMuted(type);
 }
 
 // static
 void VolumeControl::SetMuted(AudioContentType type, bool muted) {
-  g_volume_control.Get().SetMuted(type, muted);
+  GetVolumeControl().SetMuted(type, muted);
 }
 
 // static
 void VolumeControl::SetOutputLimit(AudioContentType type, float limit) {
-  g_volume_control.Get().SetOutputLimit(type, limit);
+  GetVolumeControl().SetOutputLimit(type, limit);
 }
 
 // static

chromecast/media/cma/backend/stream_mixer.cc

@@ -14,7 +14,7 @@
 
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
-#include "base/lazy_instance.h"
+#include "base/no_destructor.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
@@ -175,9 +175,6 @@ void UseHighPriority() {
 #endif
 }
 
-base::LazyInstance<StreamMixer>::DestructorAtExit g_mixer_instance =
-    LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 float StreamMixer::VolumeInfo::GetEffectiveVolume() {
@@ -186,7 +183,8 @@ float StreamMixer::VolumeInfo::GetEffectiveVolume() {
 
 // static
 StreamMixer* StreamMixer::Get() {
-  return g_mixer_instance.Pointer();
+  static base::NoDestructor<StreamMixer> mixer_instance;
+  return mixer_instance.get();
 }
 
 StreamMixer::StreamMixer()

chromecast/media/cma/backend/volume_control.cc

@@ -16,12 +16,12 @@
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
+#include "base/no_destructor.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
@@ -69,7 +69,10 @@ std::string ContentTypeToDbFSKey(AudioContentType type) {
   }
 }
 
-base::LazyInstance<VolumeMap>::Leaky g_volume_map = LAZY_INSTANCE_INITIALIZER;
+VolumeMap& GetVolumeMap() {
+  static base::NoDestructor<VolumeMap> volume_map;
+  return *volume_map;
+}
 
 class VolumeControlInternal : public SystemVolumeControl::Delegate {
  public:
@@ -79,7 +82,7 @@ class VolumeControlInternal : public SystemVolumeControl::Delegate {
             base::WaitableEvent::ResetPolicy::MANUAL,
             base::WaitableEvent::InitialState::NOT_SIGNALED) {
     // Load volume map to check that the config file is correct.
-    g_volume_map.Get();
+    GetVolumeMap();
 
     stored_values_.SetDouble(kKeyMediaDbFS, kDefaultMediaDbFS);
     stored_values_.SetDouble(kKeyAlarmDbFS, kDefaultAlarmDbFS);
@@ -339,15 +342,19 @@ class VolumeControlInternal : public SystemVolumeControl::Delegate {
   DISALLOW_COPY_AND_ASSIGN(VolumeControlInternal);
 };
 
-base::LazyInstance<VolumeControlInternal>::Leaky g_volume_control =
-    LAZY_INSTANCE_INITIALIZER;
+// base::LazyInstance<VolumeControlInternal>::Leaky g_volume_control =
+//     LAZY_INSTANCE_INITIALIZER;
+VolumeControlInternal& GetVolumeControl() {
+  static base::NoDestructor<VolumeControlInternal> g_volume_control;
+  return *g_volume_control;
+}
 
 }  // namespace
 
 // static
 void VolumeControl::Initialize(const std::vector<std::string>& argv) {
   chromecast::InitCommandLineShlib(argv);
-  g_volume_control.Get();
+  GetVolumeControl();
 }
 
 // static
@@ -357,52 +364,52 @@ void VolumeControl::Finalize() {
 
 // static
 void VolumeControl::AddVolumeObserver(VolumeObserver* observer) {
-  g_volume_control.Get().AddVolumeObserver(observer);
+  GetVolumeControl().AddVolumeObserver(observer);
 }
 
 // static
 void VolumeControl::RemoveVolumeObserver(VolumeObserver* observer) {
-  g_volume_control.Get().RemoveVolumeObserver(observer);
+  GetVolumeControl().RemoveVolumeObserver(observer);
 }
 
 // static
 float VolumeControl::GetVolume(AudioContentType type) {
-  return g_volume_control.Get().GetVolume(type);
+  return GetVolumeControl().GetVolume(type);
 }
 
 // static
 void VolumeControl::SetVolume(AudioContentType type, float level) {
-  g_volume_control.Get().SetVolume(type, level);
+  GetVolumeControl().SetVolume(type, level);
 }
 
 // static
 bool VolumeControl::IsMuted(AudioContentType type) {
-  return g_volume_control.Get().IsMuted(type);
+  return GetVolumeControl().IsMuted(type);
 }
 
 // static
 void VolumeControl::SetMuted(AudioContentType type, bool muted) {
-  g_volume_control.Get().SetMuted(type, muted);
+  GetVolumeControl().SetMuted(type, muted);
 }
 
 // static
 void VolumeControl::SetOutputLimit(AudioContentType type, float limit) {
-  g_volume_control.Get().SetOutputLimit(type, limit);
+  GetVolumeControl().SetOutputLimit(type, limit);
 }
 
 // static
 float VolumeControl::VolumeToDbFS(float volume) {
-  return g_volume_map.Get().VolumeToDbFS(volume);
+  return GetVolumeMap().VolumeToDbFS(volume);
 }
 
 // static
 float VolumeControl::DbFSToVolume(float db) {
-  return g_volume_map.Get().DbFSToVolume(db);
+  return GetVolumeMap().DbFSToVolume(db);
 }
 
 // static
 void VolumeControl::SetPowerSaveMode(bool power_save_on) {
-  g_volume_control.Get().SetPowerSaveMode(power_save_on);
+  GetVolumeControl().SetPowerSaveMode(power_save_on);
 }
 
 }  // namespace media