Fix undefined argument evaluation order bug. (youtube#705)

b/288627621
dahlstrom-g · Jun 26, 2023 · 79e149d · 79e149d
1 parent 14f58b6
commit 79e149d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cobalt/browser/metrics/cobalt_metrics_services_manager_client.cc b/cobalt/browser/metrics/cobalt_metrics_services_manager_client.cc
@@ -35,8 +35,9 @@ namespace metrics {
 
 std::unique_ptr<::metrics::MetricsServiceClient>
 CobaltMetricsServicesManagerClient::CreateMetricsServiceClient() {
-  return std::make_unique<CobaltMetricsServiceClient>(GetMetricsStateManager(),
-                                                      local_state_.get());
+  InitializeMetricsStateManagerAndLocalState();
+  return std::make_unique<CobaltMetricsServiceClient>(
+      metrics_state_manager_.get(), local_state_.get());
 }
 
 std::unique_ptr<const base::FieldTrial::EntropyProvider>
@@ -79,8 +80,8 @@ CobaltMetricsServicesManagerClient::GetMetricsStateManagerForTesting() {
   return GetMetricsStateManager();
 }
 
-::metrics::MetricsStateManager*
-CobaltMetricsServicesManagerClient::GetMetricsStateManager() {
+void CobaltMetricsServicesManagerClient::
+    InitializeMetricsStateManagerAndLocalState() {
   if (!metrics_state_manager_) {
     PrefServiceFactory pref_service_factory;
     pref_service_factory.set_user_prefs(
@@ -98,6 +99,11 @@ CobaltMetricsServicesManagerClient::GetMetricsStateManager() {
         base::BindRepeating(&StoreMetricsClientInfo),
         base::BindRepeating(&LoadMetricsClientInfo));
   }
+}
+
+::metrics::MetricsStateManager*
+CobaltMetricsServicesManagerClient::GetMetricsStateManager() {
+  InitializeMetricsStateManagerAndLocalState();
   return metrics_state_manager_.get();
 }
 

diff --git a/cobalt/browser/metrics/cobalt_metrics_services_manager_client.h b/cobalt/browser/metrics/cobalt_metrics_services_manager_client.h
@@ -75,6 +75,8 @@ class CobaltMetricsServicesManagerClient
   ::metrics::MetricsStateManager* GetMetricsStateManagerForTesting();
 
  private:
+  void InitializeMetricsStateManagerAndLocalState();
+
   ::metrics::MetricsStateManager* GetMetricsStateManager();
 
   // MetricsStateManager which is passed as a parameter to service constructors.