GTTF: Fix cc_unittests ignoring gtest_filter with new test launcher.

BUG=299200, 236893
R=danakj@chromium.org, jamesr@chromium.org

Review URL: https://codereview.chromium.org/70943002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235184 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 7 deletions

diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 9d7c158..32b79f3 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -23,6 +23,7 @@
 #include "base/test/test_switches.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
@@ -104,6 +105,7 @@ void TestSuite::PreInitialize(int argc, char** argv,
   base::EnableTerminationOnHeapCorruption();
   initialized_command_line_ = CommandLine::Init(argc, argv);
   testing::InitGoogleTest(&argc, argv);
+  testing::InitGoogleMock(&argc, argv);
 #if defined(OS_LINUX) && defined(USE_AURA)
   // When calling native char conversion functions (e.g wrctomb) we need to
   // have the locale set. In the absence of such a call the "C" locale is the
diff --git a/cc/test/run_all_perftests.cc b/cc/test/run_all_perftests.cc
index abe8549..bef84a9 100644
--- a/cc/test/run_all_perftests.cc
+++ b/cc/test/run_all_perftests.cc
@@ -3,10 +3,8 @@
 // found in the LICENSE file.
 
 #include "cc/test/cc_test_suite.h"
-#include "testing/gmock/include/gmock/gmock.h"
 
 int main(int argc, char** argv) {
-  ::testing::InitGoogleMock(&argc, argv);
   cc::CCTestSuite test_suite(argc, argv);
 
   // Always run the perf tests serially, to avoid distorting
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index 235bd2e..e5e3136 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -7,10 +7,8 @@
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "cc/test/cc_test_suite.h"
-#include "testing/gmock/include/gmock/gmock.h"
 
 int main(int argc, char** argv) {
-  ::testing::InitGoogleMock(&argc, argv);
   cc::CCTestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(
diff --git a/webkit/renderer/compositor_bindings/test/run_all_unittests.cc b/webkit/renderer/compositor_bindings/test/run_all_unittests.cc
index 1bdc142..73a23bf 100644
--- a/webkit/renderer/compositor_bindings/test/run_all_unittests.cc
+++ b/webkit/renderer/compositor_bindings/test/run_all_unittests.cc
@@ -6,7 +6,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gmock/include/gmock/gmock.h"
 
 namespace {
 
@@ -18,8 +17,6 @@ int RunTestSuite(TestSuite* test_suite) {
 }  // namespace
 
 int main(int argc, char** argv) {
-  ::testing::InitGoogleMock(&argc, argv);
-
   TestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(