Upload UMA data using protocol buffers.

chrome/common/metrics/metrics_log_manager_unittest.cc

 // Copyright (c) 2012 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 <string>
+#include <utility>
+#include <vector>
+
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include <string>
-#include <vector>
+typedef MetricsLogManager::SerializedLog SerializedLog;
 
 namespace {
+
 class MetricsLogManagerTest : public testing::Test {
 };
 
 // Dummy serializer that just stores logs in memory.
 class DummyLogSerializer : public MetricsLogManager::LogSerializer {
  public:
-  virtual void SerializeLogs(const std::vector<std::string>& logs,
+  virtual void SerializeLogs(const std::vector<SerializedLog>& logs,
                              MetricsLogManager::LogType log_type) {
     persisted_logs_[log_type] = logs;
   }
 
   virtual void DeserializeLogs(MetricsLogManager::LogType log_type,
-                               std::vector<std::string>* logs) {
+                               std::vector<SerializedLog>* logs) {
     ASSERT_NE(static_cast<void*>(NULL), logs);
     *logs = persisted_logs_[log_type];
   }
 
   // Returns the number of logs of the given type.
   size_t TypeCount(MetricsLogManager::LogType log_type) {
     return persisted_logs_[log_type].size();
   }
 
   // In-memory "persitent storage".
-  std::vector<std::string> persisted_logs_[2];
+  std::vector<SerializedLog> persisted_logs_[2];
 };
-};  // namespace
+
+}  // namespace
 
 TEST(MetricsLogManagerTest, StandardFlow) {
   MetricsLogManager log_manager;
 
   // Make sure a new manager has a clean slate.
   EXPECT_EQ(NULL, log_manager.current_log());
   EXPECT_FALSE(log_manager.has_staged_log());
   EXPECT_FALSE(log_manager.has_unsent_logs());
 
   // Check that the normal flow works.
@@ skipping 53 matching lines @@
   EXPECT_FALSE(log_manager.has_staged_log());
 
   log_manager.ResumePausedLog();
   EXPECT_EQ(ongoing_log, log_manager.current_log());
   EXPECT_FALSE(log_manager.has_staged_log());
 
   EXPECT_FALSE(log_manager.has_unsent_logs());
 }
 
 TEST(MetricsLogManagerTest, StoreAndLoad) {
-  std::vector<std::string> initial_logs;
-  std::vector<std::string> ongoing_logs;
+  std::vector<SerializedLog> initial_logs;
+  std::vector<SerializedLog> ongoing_logs;
 
   // Set up some in-progress logging in a scoped log manager simulating the
   // leadup to quitting, then persist as would be done on quit.
   {
     MetricsLogManager log_manager;
     DummyLogSerializer* serializer = new DummyLogSerializer;
     log_manager.set_log_serializer(serializer);
     // Simulate a log having already been unsent from a previous session.
-    serializer->persisted_logs_[MetricsLogManager::ONGOING_LOG].push_back("a");
+    SerializedLog log = {"xml", "proto"};
+    serializer->persisted_logs_[MetricsLogManager::ONGOING_LOG].push_back(log);
     EXPECT_FALSE(log_manager.has_unsent_logs());
     log_manager.LoadPersistedUnsentLogs();
     EXPECT_TRUE(log_manager.has_unsent_logs());
 
     MetricsLogBase* log1 = new MetricsLogBase("id", 0, "version");
     MetricsLogBase* log2 = new MetricsLogBase("id", 0, "version");
     log_manager.BeginLoggingWithLog(log1);
     log_manager.StageCurrentLogForUpload();
     log_manager.BeginLoggingWithLog(log2);
     log_manager.StoreStagedLogAsUnsent(MetricsLogManager::INITIAL_LOG);
@@ skipping 69 matching lines @@
   log_manager.BeginLoggingWithLog(log2);
   log_manager.StoreStagedLogAsUnsent(MetricsLogManager::INITIAL_LOG);
   log_manager.StageCurrentLogForUpload();
   log_manager.StoreStagedLogAsUnsent(MetricsLogManager::ONGOING_LOG);
 
   // Only the ongoing log should be written out, due to the threshold.
   log_manager.PersistUnsentLogs();
   EXPECT_EQ(1U, serializer->TypeCount(MetricsLogManager::INITIAL_LOG));
   EXPECT_EQ(0U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
 }