| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "cc/test/cc_test_suite.h" | 5 #include "content/public/test/unittest_test_suite.h" |
| 6 #include "testing/gmock/include/gmock/gmock.h" | 6 #include "content/test/content_test_suite.h" |
| 7 | 7 |
| 8 int main(int argc, char** argv) { | 8 int main(int argc, char** argv) { |
| 9 ::testing::InitGoogleMock(&argc, argv); | 9 content::UnitTestTestSuite test_suite( |
| 10 cc::CCTestSuite test_suite(argc, argv); | 10 new content::ContentTestSuite(argc, argv)); |
| 11 | 11 |
| 12 // Always run the perf tests serially, to avoid distorting | 12 // Always run the perf tests serially, to avoid distorting |
| 13 // perf measurements with randomness resulting from running | 13 // perf measurements with randomness resulting from running |
| 14 // in parallel. | 14 // in parallel. |
| 15 return test_suite.Run(); | 15 return test_suite.Run(); |
| 16 } | 16 } |
| OLD | NEW |