Moved power_monitor_test_base to a more appropriate location

BUG=236031
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/22482002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216592 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 115 deletions

diff --git a/base/power_monitor/power_monitor_test_base.cc b/base/power_monitor/power_monitor_test_base.cc
deleted file mode 100644
index 990b8d1..0000000
--- a/base/power_monitor/power_monitor_test_base.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 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 "base/power_monitor/power_monitor_test_base.h"
-
-#include "base/message_loop/message_loop.h"
-#include "base/power_monitor/power_monitor.h"
-#include "base/power_monitor/power_monitor_source.h"
-
-namespace base {
-
-PowerMonitorTestSource::PowerMonitorTestSource()
-    : test_on_battery_power_(false) {
-}
-
-PowerMonitorTestSource::~PowerMonitorTestSource() {
-}
-
-void PowerMonitorTestSource::GeneratePowerStateEvent(bool on_battery_power) {
-  test_on_battery_power_ = on_battery_power;
-  ProcessPowerEvent(POWER_STATE_EVENT);
-  message_loop_.RunUntilIdle();
-}
-
-void PowerMonitorTestSource::GenerateSuspendEvent() {
-  ProcessPowerEvent(SUSPEND_EVENT);
-  message_loop_.RunUntilIdle();
-}
-
-void PowerMonitorTestSource::GenerateResumeEvent() {
-  ProcessPowerEvent(RESUME_EVENT);
-  message_loop_.RunUntilIdle();
-}
-
-bool PowerMonitorTestSource::IsOnBatteryPowerImpl() {
-  return test_on_battery_power_;
-};
-
-PowerMonitorTestObserver::PowerMonitorTestObserver()
-    : last_power_state_(false),
-      power_state_changes_(0),
-      suspends_(0),
-      resumes_(0) {
-}
-
-PowerMonitorTestObserver::~PowerMonitorTestObserver() {
-}
-
-// PowerObserver callbacks.
-void PowerMonitorTestObserver::OnPowerStateChange(bool on_battery_power) {
-  last_power_state_ = on_battery_power;
-  power_state_changes_++;
-}
-
-void PowerMonitorTestObserver::OnSuspend() {
-  suspends_++;
-}
-
-void PowerMonitorTestObserver::OnResume() {
-  resumes_++;
-}
-
-}  // namespace base
diff --git a/base/power_monitor/power_monitor_test_base.h b/base/power_monitor/power_monitor_test_base.h
deleted file mode 100644
index 6f82fc0..0000000
--- a/base/power_monitor/power_monitor_test_base.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 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 "base/message_loop/message_loop.h"
-#include "base/power_monitor/power_monitor.h"
-#include "base/power_monitor/power_monitor_source.h"
-
-namespace base {
-
-class BASE_EXPORT PowerMonitorTestSource : public PowerMonitorSource {
- public:
-  PowerMonitorTestSource();
-  virtual ~PowerMonitorTestSource();
-
-  void GeneratePowerStateEvent(bool on_battery_power);
-  void GenerateSuspendEvent();
-  void GenerateResumeEvent();
-
- protected:
-  virtual bool IsOnBatteryPowerImpl() OVERRIDE;
-
-  bool test_on_battery_power_;
-  MessageLoop message_loop_;
-};
-
-class BASE_EXPORT PowerMonitorTestObserver : public PowerObserver {
- public:
-  PowerMonitorTestObserver();
-  virtual ~PowerMonitorTestObserver();
-
-  // PowerObserver callbacks.
-  virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE;
-  virtual void OnSuspend() OVERRIDE;
-  virtual void OnResume() OVERRIDE;
-
-  // Test status counts.
-  bool last_power_state() { return last_power_state_; }
-  int power_state_changes() { return power_state_changes_; }
-  int suspends() { return suspends_; }
-  int resumes() { return resumes_; }
-
- private:
-  bool last_power_state_; // Last power state we were notified of.
-  int power_state_changes_;  // Count of OnPowerStateChange notifications.
-  int suspends_;  // Count of OnSuspend notifications.
-  int resumes_;  // Count of OnResume notifications.
-};
-
-}  // namespace base
\ No newline at end of file
diff --git a/base/power_monitor/power_monitor_unittest.cc b/base/power_monitor/power_monitor_unittest.cc
index 61b720e..5f7b531 100644
--- a/base/power_monitor/power_monitor_unittest.cc
+++ b/base/power_monitor/power_monitor_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/power_monitor/power_monitor.h"
-#include "base/power_monitor/power_monitor_test_base.h"
+#include "base/test/power_monitor_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {