Refactor MetricsLogChromeOS to ChromeOSMetricsProvider.

chrome/browser/metrics/metrics_log.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 "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
 #include "base/android/build_info.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/metrics/metrics_log_chromeos.h"
-#endif  // OS_CHROMEOS
-
 using metrics::MetricsLogBase;
 using metrics::ProfilerEventProto;
 using metrics::SystemProfileProto;
 using tracked_objects::ProcessDataSnapshot;
 typedef variations::ActiveGroupId ActiveGroupId;
 
 namespace {
 
 // Returns the date at which the current metrics client ID was created as
 // a string containing seconds since the epoch, or "0" if none was found.
@@ skipping 123 matching lines @@
                        int session_id,
                        LogType log_type,
                        metrics::MetricsServiceClient* client)
     : MetricsLogBase(client_id,
                      session_id,
                      log_type,
                      client->GetVersionString()),
       client_(client),
       creation_time_(base::TimeTicks::Now()) {
   uma_proto()->mutable_system_profile()->set_channel(client_->GetChannel());
-
-#if defined(OS_CHROMEOS)
-  metrics_log_chromeos_.reset(new MetricsLogChromeOS(uma_proto()));
-#endif  // OS_CHROMEOS
 }
 
 MetricsLog::~MetricsLog() {}
 
 void MetricsLog::RecordStabilityMetrics(
     const std::vector<metrics::MetricsProvider*>& metrics_providers,
     base::TimeDelta incremental_uptime,
     base::TimeDelta uptime) {
   DCHECK(!locked());
   DCHECK(HasEnvironment());
@@ skipping 100 matching lines @@
 
   SystemProfileProto::Stability* stability =
       uma_proto()->mutable_system_profile()->mutable_stability();
 
   int count = pref->GetInteger(prefs::kStabilityChildProcessCrashCount);
   if (count) {
     stability->set_child_process_crash_count(count);
     pref->SetInteger(prefs::kStabilityChildProcessCrashCount, 0);
   }
 
-#if defined(OS_CHROMEOS)
-  metrics_log_chromeos_->WriteRealtimeStabilityAttributes(pref);
-#endif  // OS_CHROMEOS
-
   const uint64 incremental_uptime_sec = incremental_uptime.InSeconds();
   if (incremental_uptime_sec)
     stability->set_incremental_uptime_sec(incremental_uptime_sec);
   const uint64 uptime_sec = uptime.InSeconds();
   if (uptime_sec)
     stability->set_uptime_sec(uptime_sec);
 }
 
 void MetricsLog::RecordEnvironment(
     const std::vector<metrics::MetricsProvider*>& metrics_providers,
@@ skipping 49 matching lines @@
   base::CPU cpu_info;
   SystemProfileProto::Hardware::CPU* cpu = hardware->mutable_cpu();
   cpu->set_vendor_name(cpu_info.vendor_name());
   cpu->set_signature(cpu_info.signature());
 
   std::vector<ActiveGroupId> field_trial_ids;
   GetFieldTrialIds(&field_trial_ids);
   WriteFieldTrials(field_trial_ids, system_profile);
   WriteFieldTrials(synthetic_trials, system_profile);
 
-#if defined(OS_CHROMEOS)
-  metrics_log_chromeos_->LogChromeOSMetrics();
-#endif  // OS_CHROMEOS
-
   for (size_t i = 0; i < metrics_providers.size(); ++i)
     metrics_providers[i]->ProvideSystemProfileMetrics(system_profile);
 
   std::string serialied_system_profile;
   std::string base64_system_profile;
   if (system_profile->SerializeToString(&serialied_system_profile)) {
     base::Base64Encode(serialied_system_profile, &base64_system_profile);
     PrefService* local_state = GetPrefService();
     local_state->SetString(prefs::kStabilitySavedSystemProfile,
                            base64_system_profile);
@@ skipping 38 matching lines @@
     profile = uma_proto()->add_profiler_event();
     profile->set_profile_type(ProfilerEventProto::STARTUP_PROFILE);
     profile->set_time_source(ProfilerEventProto::WALL_CLOCK_TIME);
   } else {
     // For the remaining calls, re-use the existing field.
     profile = uma_proto()->mutable_profiler_event(0);
   }
 
   WriteProfilerData(process_data, process_type, profile);
 }