summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 19:40:11 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 19:40:11 +0000
commit20e14913cdb627bc6d6751dedc18fe23c3893671 (patch)
tree81654b4186f92345c8435bf10579aca31b14543a /media
parent2045b41427fd10137d9c97dbc3d2ab536fd45480 (diff)
downloadchromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.zip
chromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.tar.gz
chromium_src-20e14913cdb627bc6d6751dedc18fe23c3893671.tar.bz2
Re-land part of r55416, minus actually moving the test_suite.h contents to a .cc file.
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@56399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/run_all_unittests.cc2
-rw-r--r--media/mf/test/run_all_unittests.cc1
-rw-r--r--media/omx/run_all_unittests.cc4
3 files changed, 5 insertions, 2 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/mf/test/run_all_unittests.cc b/media/mf/test/run_all_unittests.cc
index 6551d59..76d9182 100644
--- a/media/mf/test/run_all_unittests.cc
+++ b/media/mf/test/run_all_unittests.cc
@@ -4,6 +4,7 @@
#include <cstdio>
+#include "base/file_path.h"
#include "base/test/test_suite.h"
#include "media/base/media.h"
#include "media/ffmpeg/ffmpeg_common.h"
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();
}