Chromium Code Reviews| Index: chrome/browser/metrics/metrics_log.h |
| diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h |
| index bd67ff85defd312a5ec2733cfb859633502a0335..54c25f9feb9a98b01f7c18ca3e9ddb3f5a395118 100644 |
| --- a/chrome/browser/metrics/metrics_log.h |
| +++ b/chrome/browser/metrics/metrics_log.h |
| @@ -19,7 +19,7 @@ |
| #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,
tdresser
2014/01/30 19:32:30
Done.
|
| #endif |
| class MetricsNetworkObserver; |
| @@ -35,10 +35,6 @@ namespace content { |
| struct WebPluginInfo; |
| } |
| -namespace device { |
| -class BluetoothAdapter; |
| -} |
| - |
| namespace tracked_objects { |
| struct ProcessDataSnapshot; |
| } |
| @@ -145,6 +141,11 @@ class MetricsLog : public MetricsLogBase { |
| 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); |
| @@ -176,32 +177,9 @@ class MetricsLog : public MetricsLogBase { |
| // 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_; |