diff options
| author | sverrir@google.com <sverrir@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 21:38:38 +0000 |
|---|---|---|
| committer | sverrir@google.com <sverrir@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 21:38:38 +0000 |
| commit | c109691b7032671759ba4375ef703f4b0784dd3d (patch) | |
| tree | 81100ebeed2c93b738db1dc127f8cb8d217f5be7 /printing | |
| parent | ef6fdb767d0a059f67c782ab40c396d5c076c4d1 (diff) | |
| download | chromium_src-c109691b7032671759ba4375ef703f4b0784dd3d.zip chromium_src-c109691b7032671759ba4375ef703f4b0784dd3d.tar.gz chromium_src-c109691b7032671759ba4375ef703f4b0784dd3d.tar.bz2 | |
Make the printint_unittest use the correct test harness. This removes the need for an AtExitManager in one of the tests (which is just plain wrong).
BUG=none
TEST=no functional change (printing_unittests should run successfully).
Review URL: http://codereview.chromium.org/149407
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/page_overlays_unittest.cc | 3 | ||||
| -rw-r--r-- | printing/printing.gyp | 1 | ||||
| -rw-r--r-- | printing/run_all_unittests.cc | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/printing/page_overlays_unittest.cc b/printing/page_overlays_unittest.cc index 2d1bdac..ccdc15a 100644 --- a/printing/page_overlays_unittest.cc +++ b/printing/page_overlays_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/at_exit.h" #include "base/message_loop.h" #include "base/string_util.h" #include "printing/page_overlays.h" @@ -14,8 +13,6 @@ namespace { -base::AtExitManager global_at_exit_manager; - class PageOverlaysTest : public testing::Test { private: MessageLoop message_loop_; diff --git a/printing/printing.gyp b/printing/printing.gyp index e0f1d38..8dd7a59 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -89,6 +89,7 @@ 'page_range_unittest.cc', 'page_setup_unittest.cc', 'printing_context_win_unittest.cc', + 'run_all_unittests.cc', 'units_unittest.cc', ], 'conditions': [ diff --git a/printing/run_all_unittests.cc b/printing/run_all_unittests.cc index d9f6b58..63b8020 100644 --- a/printing/run_all_unittests.cc +++ b/printing/run_all_unittests.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test_suite.h" +#include "app/test_suite.h" int main(int argc, char** argv) { - return TestSuite(argc, argv).Run(); + return AppTestSuite(argc, argv).Run(); } |