Index: components/test/run_all_unittests.cc |
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc |
index 5cd4102f9f55014ecf5422a1ef4e9e39de409cb2..91330dbf893dcb6501f5e27bd1873c3fa10d66c7 100644 |
--- a/components/test/run_all_unittests.cc |
+++ b/components/test/run_all_unittests.cc |
@@ -11,6 +11,7 @@ |
#include "base/test/test_suite.h" |
#include "components/content_settings/core/common/content_settings_pattern.h" |
#include "content/public/test/test_content_client_initializer.h" |
+#include "content/public/test/unittest_test_suite.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
@@ -107,7 +108,8 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener { |
} // namespace |
int main(int argc, char** argv) { |
- ComponentsTestSuite test_suite(argc, argv); |
+ // UnitTestTestSuite initializes blink. |
+ content::UnitTestTestSuite test_suite(new ComponentsTestSuite(argc, argv)); |
// The listener will set up common test environment for all components unit |
// tests. |
@@ -116,6 +118,6 @@ int main(int argc, char** argv) { |
listeners.Append(new ComponentsUnitTestEventListener()); |
return base::LaunchUnitTests( |
- argc, argv, base::Bind(&base::TestSuite::Run, |
+ argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
base::Unretained(&test_suite))); |
} |