| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
| 7 #include "base/values.h" |
| 7 #include "content/public/test/unittest_test_suite.h" | 8 #include "content/public/test/unittest_test_suite.h" |
| 8 #include "content/test/content_test_suite.h" | 9 #include "content/test/content_test_suite.h" |
| 9 #include "content/test/content_unittests_catalog_source.h" | 10 #include "content/test/content_unittests_catalog_source.h" |
| 10 #include "services/catalog/catalog.h" | 11 #include "services/catalog/catalog.h" |
| 11 | 12 |
| 12 int main(int argc, char** argv) { | 13 int main(int argc, char** argv) { |
| 13 content::UnitTestTestSuite test_suite( | 14 content::UnitTestTestSuite test_suite( |
| 14 new content::ContentTestSuite(argc, argv)); | 15 new content::ContentTestSuite(argc, argv)); |
| 15 | 16 |
| 16 catalog::Catalog::SetDefaultCatalogManifest( | 17 catalog::Catalog::SetDefaultCatalogManifest( |
| 17 content::CreateContentUnittestsCatalog()); | 18 content::CreateContentUnittestsCatalog()); |
| 18 | 19 |
| 19 return base::LaunchUnitTests( | 20 return base::LaunchUnitTests( |
| 20 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 21 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
| 21 base::Unretained(&test_suite))); | 22 base::Unretained(&test_suite))); |
| 22 } | 23 } |
| OLD | NEW |