Revert of [chromeos/about:power] Collect cpuidle and cpufreq stats

chrome/browser/chromeos/power/power_data_collector.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/power/cpu_data_collector.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/power_manager_client.h"
 
 namespace power_manager {
 class PowerSupplyProperties;
 }
 
 namespace chromeos {
 
 // A class which starts collecting power metrics, like the battery charge, as
@@ skipping 33 matching lines @@
   };
 
   const std::deque<PowerSupplySample>& power_supply_data() const {
     return power_supply_data_;
   }
 
   const std::deque<SystemResumedSample>& system_resumed_data() const {
     return system_resumed_data_;
   }
 
-  const CpuDataCollector& cpu_data_collector() const {
-    return cpu_data_collector_;
-  }
-
   // Can be called only after DBusThreadManager is initialized.
   static void Initialize();
 
-  // Same as Initialize, but does not start the CpuDataCollector.
-  static void InitializeForTesting();
-
   // Can be called only if initialized via Initialize, and before
   // DBusThreadManager is destroyed.
   static void Shutdown();
 
   // Returns the global instance of PowerDataCollector.
   static PowerDataCollector* Get();
 
   // PowerManagerClient::Observer implementation:
   virtual void PowerChanged(
       const power_manager::PowerSupplyProperties& prop) OVERRIDE;
   virtual void SystemResumed(const base::TimeDelta& sleep_duration) OVERRIDE;
 
   // Only those power data samples which fall within the last
   // |kSampleTimeLimitSec| are stored in memory.
   static const int kSampleTimeLimitSec;
 
  private:
-  explicit PowerDataCollector(const bool start_cpu_data_collector);
+  PowerDataCollector();
 
   virtual ~PowerDataCollector();
 
   std::deque<PowerSupplySample> power_supply_data_;
   std::deque<SystemResumedSample> system_resumed_data_;
-  CpuDataCollector cpu_data_collector_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerDataCollector);
 };
 
 // Adds |sample| to |sample_deque|.
 // It dumps samples |PowerDataCollector::kSampleTimeLimitSec| or more older than
 // |sample|.
 template <typename SampleType>
 void AddSample(std::deque<SampleType>* sample_queue, const SampleType& sample) {
   while (!sample_queue->empty()) {
     const SampleType& first = sample_queue->front();
     if (sample.time - first.time >
         base::TimeDelta::FromSeconds(PowerDataCollector::kSampleTimeLimitSec)) {
       sample_queue->pop_front();
     } else {
       break;
     }
   }
   sample_queue->push_back(sample);
 }
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_POWER_POWER_DATA_COLLECTOR_H_