Factor ChromeOS specific code out of MetricsLog.

chrome/browser/metrics/metrics_log.h

 // 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.
 
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/metrics/metrics_network_observer.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/metrics/perf_provider_chromeos.h"
+#include "metrics_log_chromeos.h"

[Alexei Svitkine (slow), 2014/01/30 18:17:54]

This should still be a full include path.

Though, perhaps you can get away with a forward decl here?

[tdresser, 2014/01/30 19:32:30]

Done.

 #endif
 
 class MetricsNetworkObserver;
 struct OmniboxLog;
 class PrefService;
 class PrefRegistrySimple;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 struct WebPluginInfo;
 }
 
-namespace device {
-class BluetoothAdapter;
-}
-
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
 
 namespace chrome_variations {
 struct ActiveGroupId;
 }
 
 // This is a small helper struct to pass Google Update metrics in a single
 // reference argument to MetricsLog::RecordEnvironment().
@@ skipping 86 matching lines @@
   virtual float GetScreenDeviceScaleFactor() const;
 
   // Returns the number of monitors the user is using.
   virtual int GetScreenCount() const;
 
   // Fills |field_trial_ids| with the list of initialized field trials name and
   // group ids.
   virtual void GetFieldTrialIds(
       std::vector<chrome_variations::ActiveGroupId>* field_trial_ids) const;
 
+  // Exposed to allow dependency injection for tests.
+#if defined(OS_CHROMEOS)
+  scoped_ptr<MetricsLogChromeOS> metrics_log_chromeos_;
+#endif
+
  private:
   FRIEND_TEST_ALL_PREFIXES(MetricsLogTest, ChromeOSStabilityData);
 
   // Returns true if the environment has already been filled in by a call to
   // RecordEnvironment() or LoadSavedEnvironmentFromPrefs().
   bool HasEnvironment() const;
 
   // Returns true if the stability metrics have already been filled in by a
   // call to RecordStabilityMetrics().
   bool HasStabilityMetrics() const;
@@ skipping 11 matching lines @@
   void WriteRealtimeStabilityAttributes(PrefService* pref,
                                         base::TimeDelta incremental_uptime);
 
   // Writes the list of installed plugins.
   void WritePluginList(const std::vector<content::WebPluginInfo>& plugin_list);
 
   // Writes info about the Google Update install that is managing this client.
   // This is a no-op if called on a non-Windows platform.
   void WriteGoogleUpdateProto(const GoogleUpdateMetrics& google_update_metrics);
 
-  // Sets the Bluetooth Adapter instance used for the WriteBluetoothProto()
-  // call.
-  void SetBluetoothAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
-
-  // Writes info about paired Bluetooth devices on this system.
-  // This is a no-op if called on a non-Chrome OS platform.
-  virtual void WriteBluetoothProto(
-      metrics::SystemProfileProto::Hardware* hardware);
-
-#if defined(OS_CHROMEOS)
-  // Update the number of users logged into a multi-profile session.
-  // If the number of users change while the log is open, the call invalidates
-  // the user count value.
-  void UpdateMultiProfileUserCount();
-#endif
-
   // Observes network state to provide values for SystemProfile::Network.
   MetricsNetworkObserver network_observer_;
 
-#if defined(OS_CHROMEOS)
-  metrics::PerfProvider perf_provider_;
-#endif
-
-  // Bluetooth Adapter instance for collecting information about paired devices.
-  scoped_refptr<device::BluetoothAdapter> adapter_;
-
   // The time when the current log was created.
   const base::TimeTicks creation_time_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_