diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 15:25:53 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-09 15:25:53 +0000 |
commit | 19d536f25ffa4e876c7af79b201c7330841b31ea (patch) | |
tree | 2f64619a8812920692bd3c7e69103727021e9d53 /media | |
parent | 6c4e6631acb0893ba00f035792e80942e2b00bd3 (diff) | |
download | chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.zip chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.gz chromium_src-19d536f25ffa4e876c7af79b201c7330841b31ea.tar.bz2 |
Cleanup in base. This moves the implementation (and a bunch of header file
dependencies) from the multiprocess test and the test_suite headers to .cc
files. Moves multiprocess_test to the test directory, and all of this stuff to
the existing base_test_support project. I also used the base namespace.
Previously other projects included this functionality just by #include because
it was all inline, so I had to add dependencies on base_test_support in a few
places.
Moves and renames the command line switch this was using to base_switches. Move
the base switch for process type to chrome switches.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3026055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/base/run_all_unittests.cc | 2 | ||||
-rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 2 | ||||
-rw-r--r-- | media/media.gyp | 3 | ||||
-rw-r--r-- | media/omx/run_all_unittests.cc | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index b9a5529..b715a328b 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -5,5 +5,5 @@ #include "base/test/test_suite.h" int main(int argc, char** argv) { - return TestSuite(argc, argv).Run(); + return base::TestSuite(argc, argv).Run(); } diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index 14b117d..343486e 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -42,7 +42,7 @@ #include "testing/gtest/include/gtest/gtest.h" int main(int argc, char** argv) { - return PerfTestSuite(argc, argv).Run(); + return base::PerfTestSuite(argc, argv).Run(); } namespace media { diff --git a/media/media.gyp b/media/media.gyp index bb35b5e..b2c3a74 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -182,6 +182,7 @@ 'media', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -216,6 +217,7 @@ 'media', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', @@ -470,6 +472,7 @@ 'omx_wrapper', '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'conditions': [ diff --git a/media/omx/run_all_unittests.cc b/media/omx/run_all_unittests.cc index dbc6ea8..b28ef94 100644 --- a/media/omx/run_all_unittests.cc +++ b/media/omx/run_all_unittests.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/file_path.h" +#include "base/logging.h" #include "base/test/test_suite.h" #include "media/base/media.h" @@ -11,5 +13,5 @@ int main(int argc, char** argv) { LOG(ERROR) << "Unable to initialize OpenMAX library."; return -1; } - return TestSuite(argc, argv).Run(); + return base::TestSuite(argc, argv).Run(); } |