Always check if providers have initial stability metrics.

components/metrics/metrics_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/metrics/metrics_service.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 158 matching lines @@
 
   TestMetricsServiceClient client;
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
 
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
+
   // No initial stability log should be generated.
   EXPECT_FALSE(service.log_manager()->has_unsent_logs());
   EXPECT_FALSE(service.log_manager()->has_staged_log());
 
+  // Ensure that HasInitialStabilityMetrics() is always called on providers,
+  // for consistency, even if other conditions already indicate their presence.
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());
+
   // The test provider should not have been called upon to provide initial
   // stability nor regular stability metrics.
   EXPECT_FALSE(test_provider->provide_initial_stability_metrics_called());
   EXPECT_FALSE(test_provider->provide_stability_metrics_called());
 }
 
 TEST_F(MetricsServiceTest, InitialStabilityLogAtProviderRequest) {
   EnableMetricsReporting();
 
   // Save an existing system profile to prefs, to correspond to what would be
@@ skipping 22 matching lines @@
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
 
   // The initial stability log should be generated and persisted in unsent logs.
   MetricsLogManager* log_manager = service.log_manager();
   EXPECT_TRUE(log_manager->has_unsent_logs());
   EXPECT_FALSE(log_manager->has_staged_log());
 
+  // Ensure that HasInitialStabilityMetrics() is always called on providers,
+  // for consistency, even if other conditions already indicate their presence.
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());
+
   // The test provider should have been called upon to provide initial
   // stability and regular stability metrics.
   EXPECT_TRUE(test_provider->provide_initial_stability_metrics_called());
   EXPECT_TRUE(test_provider->provide_stability_metrics_called());
 
   // Stage the log and retrieve it.
   log_manager->StageNextLogForUpload();
   EXPECT_TRUE(log_manager->has_staged_log());
 
   std::string uncompressed_log;
@@ skipping 44 matching lines @@
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
   service.InitializeMetricsRecordingState();
 
   // The initial stability log should be generated and persisted in unsent logs.
   MetricsLogManager* log_manager = service.log_manager();
   EXPECT_TRUE(log_manager->has_unsent_logs());
   EXPECT_FALSE(log_manager->has_staged_log());
 
+  // Ensure that HasInitialStabilityMetrics() is always called on providers,
+  // for consistency, even if other conditions already indicate their presence.
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());
+
   // The test provider should have been called upon to provide initial
   // stability and regular stability metrics.
   EXPECT_TRUE(test_provider->provide_initial_stability_metrics_called());
   EXPECT_TRUE(test_provider->provide_stability_metrics_called());
 
   // Stage the log and retrieve it.
   log_manager->StageNextLogForUpload();
   EXPECT_TRUE(log_manager->has_staged_log());
 
   std::string uncompressed_log;
@@ skipping 105 matching lines @@
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
 
   EXPECT_TRUE(test_provider->init_called());
 }
 
 }  // namespace metrics