Index: chrome/browser/chromeos/power/power_data_collector.cc |
diff --git a/chrome/browser/chromeos/power/power_data_collector.cc b/chrome/browser/chromeos/power/power_data_collector.cc |
index a6ffe8f635264b78445cd76ae65cbb813d00094b..b997bb03a9393c7ab51c4f0c4b6a7d007742e9bc 100644 |
--- a/chrome/browser/chromeos/power/power_data_collector.cc |
+++ b/chrome/browser/chromeos/power/power_data_collector.cc |
@@ -25,13 +25,7 @@ |
// DBusThreadManager is initialized. |
CHECK(DBusThreadManager::Get()); |
CHECK(g_power_data_collector == NULL); |
- g_power_data_collector = new PowerDataCollector(true); |
-} |
- |
-void PowerDataCollector::InitializeForTesting() { |
- CHECK(DBusThreadManager::Get()); |
- CHECK(g_power_data_collector == NULL); |
- g_power_data_collector = new PowerDataCollector(false); |
+ g_power_data_collector = new PowerDataCollector(); |
} |
// static |
@@ -66,10 +60,8 @@ |
AddSample(&system_resumed_data_, sample); |
} |
-PowerDataCollector::PowerDataCollector(const bool start_cpu_data_collector) { |
+PowerDataCollector::PowerDataCollector() { |
DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this); |
- if (start_cpu_data_collector) |
- cpu_data_collector_.Start(); |
} |
PowerDataCollector::~PowerDataCollector() { |