Attempted P3A crash fix

Author: DJAndries

browser/brave_browser_main_extra_parts.cc

@@ -76,7 +76,7 @@ void BraveBrowserMainExtraParts::PreMainMessageLoopRun() {
   // Disabled on mobile platforms, see for instance issues/6176
   if (g_brave_browser_process->p3a_service() != nullptr) {
     // TODO(iefremov): Maybe find a better place for this initialization.
-    g_brave_browser_process->p3a_service()->Init(
+    g_brave_browser_process->p3a_service()->SetURLLoaderFactory(
         g_browser_process->shared_url_loader_factory());
   }
 

components/p3a/p3a_service.cc

@@ -192,12 +192,13 @@ bool P3AService::IsP3AEnabled() const {
   return local_state_->GetBoolean(kP3AEnabled);
 }
 
-void P3AService::Init(
+void P3AService::SetURLLoaderFactory(
     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
-  if (url_loader_factory) {
-    url_loader_factory_ = url_loader_factory;
-  }
+  url_loader_factory_ = url_loader_factory;
+  Init();
+}
 
+void P3AService::Init() {
   if (initialized_ || !url_loader_factory_) {
     return;
   }
@@ -262,7 +263,7 @@ const MetricConfig* P3AService::GetBaseMetricConfig(
 
 void P3AService::OnRemoteConfigLoaded() {
   if (!initialized_) {
-    Init(nullptr);
+    Init();
   } else {
     message_manager_->RemoveObsoleteLogs();
   }

components/p3a/p3a_service.h

@@ -93,8 +93,8 @@ class P3AService : public base::RefCountedThreadSafe<P3AService>,
 
   bool IsP3AEnabled() const;
 
-  // Needs a living browser process to complete the initialization.
-  void Init(scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
+  void SetURLLoaderFactory(
+      scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory);
 
   // Invoked by callbacks registered by our service. Since these callbacks
   // can fire on any thread, this method reposts everything to UI thread.
@@ -129,6 +129,8 @@ class P3AService : public base::RefCountedThreadSafe<P3AService>,
   friend class base::RefCountedThreadSafe<P3AService>;
   ~P3AService() override;
 
+  void Init();
+
   void InitCallback(std::string_view histogram_name);
 
   void LoadDynamicMetrics();

components/p3a/p3a_service_unittest.cc

@@ -90,7 +90,7 @@ class P3AServiceTest : public testing::Test {
         local_state_, "release", install_time, P3AConfig(config_)));
 
     p3a_service_->DisableStarAttestationForTesting();
-    p3a_service_->Init(shared_url_loader_factory_);
+    p3a_service_->SetURLLoaderFactory(shared_url_loader_factory_);
     p3a_service_->remote_config_manager()->LoadRemoteConfig({});
     task_environment_.RunUntilIdle();
   }