Split a MetricsLogStore object out of MetricsLogManager.

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 34 matching lines @@
 
 class TestMetricsService : public MetricsService {
  public:
   TestMetricsService(MetricsStateManager* state_manager,
                      MetricsServiceClient* client,
                      PrefService* local_state)
       : MetricsService(state_manager, client, local_state) {}
   ~TestMetricsService() override {}
 
   using MetricsService::log_manager;
+  using MetricsService::log_store;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestMetricsService);
 };
 
 class TestMetricsLog : public MetricsLog {
  public:
   TestMetricsLog(const std::string& client_id,
                  int session_id,
                  MetricsServiceClient* client,
@@ skipping 115 matching lines @@
   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());
+  EXPECT_FALSE(service.log_store()->has_unsent_logs());
+  EXPECT_FALSE(service.log_store()->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());
 }
@@ skipping 23 matching lines @@
       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();
 
   // 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());
+  MetricsLogStore* log_store = service.log_store();
+  EXPECT_TRUE(log_store->has_unsent_logs());
+  EXPECT_FALSE(log_store->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());
+  log_store->StageNextLog();
+  EXPECT_TRUE(log_store->has_staged_log());
 
   std::string uncompressed_log;
-  EXPECT_TRUE(compression::GzipUncompress(log_manager->staged_log(),
-                                          &uncompressed_log));
+  EXPECT_TRUE(
+      compression::GzipUncompress(log_store->staged_log(), &uncompressed_log));
 
   ChromeUserMetricsExtension uma_log;
   EXPECT_TRUE(uma_log.ParseFromString(uncompressed_log));
 
   EXPECT_TRUE(uma_log.has_client_id());
   EXPECT_TRUE(uma_log.has_session_id());
   EXPECT_TRUE(uma_log.has_system_profile());
   EXPECT_EQ(0, uma_log.user_action_event_size());
   EXPECT_EQ(0, uma_log.omnibox_event_size());
   EXPECT_EQ(0, uma_log.profiler_event_size());
@@ skipping 28 matching lines @@
 
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
   // Add a provider.
   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());
+  MetricsLogStore* log_store = service.log_store();
+  EXPECT_TRUE(log_store->has_unsent_logs());
+  EXPECT_FALSE(log_store->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());
+  log_store->StageNextLog();
+  EXPECT_TRUE(log_store->has_staged_log());
 
   std::string uncompressed_log;
-  EXPECT_TRUE(compression::GzipUncompress(log_manager->staged_log(),
-                                          &uncompressed_log));
+  EXPECT_TRUE(
+      compression::GzipUncompress(log_store->staged_log(), &uncompressed_log));
 
   ChromeUserMetricsExtension uma_log;
   EXPECT_TRUE(uma_log.ParseFromString(uncompressed_log));
 
   EXPECT_TRUE(uma_log.has_client_id());
   EXPECT_TRUE(uma_log.has_session_id());
   EXPECT_TRUE(uma_log.has_system_profile());
   EXPECT_EQ(0, uma_log.user_action_event_size());
   EXPECT_EQ(0, uma_log.omnibox_event_size());
   EXPECT_EQ(0, uma_log.profiler_event_size());
@@ skipping 49 matching lines @@
                                          HashName("Group3"));
   service.RegisterSyntheticFieldTrial(trial4);
   service.GetSyntheticFieldTrialsOlderThan(begin_log_time, &synthetic_trials);
   EXPECT_EQ(1U, synthetic_trials.size());
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial2", "Group2"));
 
   // Ensure that time has advanced by at least a tick before proceeding.
   WaitUntilTimeChanges(base::TimeTicks::Now());
 
   // Start a new log and ensure all three trials appear in it.
-  service.log_manager_.FinishCurrentLog();
+  service.log_manager_.FinishCurrentLog(service.log_store());
   service.log_manager_.BeginLoggingWithLog(
       std::unique_ptr<MetricsLog>(new MetricsLog(
           "clientID", 1, MetricsLog::ONGOING_LOG, &client, GetLocalState())));
   service.GetSyntheticFieldTrialsOlderThan(
       service.log_manager_.current_log()->creation_time(), &synthetic_trials);
   EXPECT_EQ(3U, synthetic_trials.size());
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial1", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial2", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial3", "Group3"));
-  service.log_manager_.FinishCurrentLog();
+  service.log_manager_.FinishCurrentLog(service.log_store());
 }
 
 TEST_F(MetricsServiceTest, RegisterSyntheticMultiGroupFieldTrial) {
   TestMetricsServiceClient client;
   MetricsService service(GetMetricsStateManager(), &client, GetLocalState());
 
   // Register a synthetic trial TestTrial1 with groups A and B.
   uint32_t trial_name_hash = HashName("TestTrial1");
   std::vector<uint32_t> group_name_hashes = {HashName("A"), HashName("B")};
   service.RegisterSyntheticMultiGroupFieldTrial(trial_name_hash,
@@ skipping 26 matching lines @@
 
   // Register a trial with no groups, which should effectively remove the trial.
   group_name_hashes.clear();
   service.RegisterSyntheticMultiGroupFieldTrial(trial_name_hash,
                                                 group_name_hashes);
   // Ensure that time has advanced by at least a tick before proceeding.
   WaitUntilTimeChanges(base::TimeTicks::Now());
 
   service.GetSyntheticFieldTrialsOlderThan(base::TimeTicks::Now(),
                                            &synthetic_trials);
-  service.log_manager_.FinishCurrentLog();
+  service.log_manager_.FinishCurrentLog(service.log_store());
 }
 
 TEST_F(MetricsServiceTest,
        MetricsProviderOnRecordingDisabledCalledOnInitialStop) {
   TestMetricsServiceClient client;
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
 
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(
@@ skipping 88 matching lines @@
   client.uploader()->CompleteUpload(200);
   EXPECT_FALSE(client.uploader()->is_uploading());
   EXPECT_EQ(1U, task_runner_->NumPendingTasks());
   // Upload should start.
   task_runner_->RunPendingTasks();
   EXPECT_TRUE(client.uploader()->is_uploading());
   EXPECT_EQ(0U, task_runner_->NumPendingTasks());
 }
 
 }  // namespace metrics