summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 17:32:32 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 17:32:32 +0000
commit85f633544904e9a2e1b47ad3a713ad764c81eaf2 (patch)
tree78ad55aeacd41a6ad480a9f3a6af28040feace19 /media
parent53bb5675486a7a3ddb0f29482fc0217f7452f833 (diff)
downloadchromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.zip
chromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.tar.gz
chromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.tar.bz2
Revert 55400 - 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 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/3035062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/run_all_unittests.cc2
-rw-r--r--media/ffmpeg/ffmpeg_unittest.cc2
-rw-r--r--media/media.gyp3
-rw-r--r--media/omx/run_all_unittests.cc4
4 files changed, 3 insertions, 8 deletions
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index b715a328b..b9a5529 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 base::TestSuite(argc, argv).Run();
+ return TestSuite(argc, argv).Run();
}
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc
index 343486e..14b117d 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 base::PerfTestSuite(argc, argv).Run();
+ return PerfTestSuite(argc, argv).Run();
}
namespace media {
diff --git a/media/media.gyp b/media/media.gyp
index b2c3a74..bb35b5e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -182,7 +182,6 @@
'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',
@@ -217,7 +216,6 @@
'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',
@@ -472,7 +470,6 @@
'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 b28ef94..dbc6ea8 100644
--- a/media/omx/run_all_unittests.cc
+++ b/media/omx/run_all_unittests.cc
@@ -2,8 +2,6 @@
// 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"
@@ -13,5 +11,5 @@ int main(int argc, char** argv) {
LOG(ERROR) << "Unable to initialize OpenMAX library.";
return -1;
}
- return base::TestSuite(argc, argv).Run();
+ return TestSuite(argc, argv).Run();
}