diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 05:02:12 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-09 05:02:12 +0000 |
| commit | a7150fb4943d87aa233c2c1d27515c770f83434f (patch) | |
| tree | 124d741cafd5716a0461ccb50828c66328bf59a0 /base | |
| parent | 1cfd39e749afc9bb776a441fdbd05e4b4cff34aa (diff) | |
| download | chromium_src-a7150fb4943d87aa233c2c1d27515c770f83434f.zip chromium_src-a7150fb4943d87aa233c2c1d27515c770f83434f.tar.gz chromium_src-a7150fb4943d87aa233c2c1d27515c770f83434f.tar.bz2 | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 2 | ||||
| -rw-r--r-- | base/base.gypi | 2 | ||||
| -rw-r--r-- | base/power_monitor/power_monitor_unittest.cc | 2 | ||||
| -rw-r--r-- | base/test/power_monitor_test_base.cc (renamed from base/power_monitor/power_monitor_test_base.cc) | 2 | ||||
| -rw-r--r-- | base/test/power_monitor_test_base.h (renamed from base/power_monitor/power_monitor_test_base.h) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/base/base.gyp b/base/base.gyp index 4b92a91..e2af06b 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -877,6 +877,8 @@ 'test/null_task_runner.h', 'test/perf_test_suite.cc', 'test/perf_test_suite.h', + 'test/power_monitor_test_base.cc', + 'test/power_monitor_test_base.h', 'test/scoped_locale.cc', 'test/scoped_locale.h', 'test/scoped_path_override.cc', diff --git a/base/base.gypi b/base/base.gypi index 7317412..6d82ee3 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -390,8 +390,6 @@ 'power_monitor/power_monitor_device_source_win.cc', 'power_monitor/power_monitor_source.cc', 'power_monitor/power_monitor_source.h', - 'power_monitor/power_monitor_test_base.cc', - 'power_monitor/power_monitor_test_base.h', 'power_monitor/power_observer.h', 'process/internal_linux.cc', 'process/internal_linux.h', 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 { diff --git a/base/power_monitor/power_monitor_test_base.cc b/base/test/power_monitor_test_base.cc index 990b8d1..73438ea 100644 --- a/base/power_monitor/power_monitor_test_base.cc +++ b/base/test/power_monitor_test_base.cc @@ -2,7 +2,7 @@ // 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/test/power_monitor_test_base.h" #include "base/message_loop/message_loop.h" #include "base/power_monitor/power_monitor.h" diff --git a/base/power_monitor/power_monitor_test_base.h b/base/test/power_monitor_test_base.h index 6f82fc0..6f82fc0 100644 --- a/base/power_monitor/power_monitor_test_base.h +++ b/base/test/power_monitor_test_base.h |