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();
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());

[Alexei Svitkine (slow), 2016/05/16 17:02:31]

Move this to the end of the function and add a comment about it, similar to
what's on line 185 - explaining *why* this behavior is desired, like you do in
the CL description.

[bcwhite, 2016/05/16 17:30:49]

Done.  Though I put it before the other test_provider call-tests so the order of
the tests continues to matche the order in which methods would be called.

+
   // No initial stability log should be generated.
   EXPECT_FALSE(service.log_manager()->has_unsent_logs());
   EXPECT_FALSE(service.log_manager()->has_staged_log());
 
   // 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());
 }
 
@@ skipping 20 matching lines @@
 
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
   // Add a metrics provider that requests a stability log.
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   test_provider->set_has_initial_stability_metrics(true);
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());
 
   // 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());
 
   // 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());
@@ skipping 44 matching lines @@
 
   GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, false);
 
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
   // Add a provider.
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(
       std::unique_ptr<MetricsProvider>(test_provider));
   service.InitializeMetricsRecordingState();
+  EXPECT_TRUE(test_provider->has_initial_stability_metrics_called());
 
   // 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());
 
   // 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());
@@ skipping 111 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