diff --git a/DEPS b/DEPS
index b110c5325ab7ed..b47e90f599c0ff 100644
--- a/DEPS
+++ b/DEPS
@@ -32,10 +32,10 @@ deps = {
     (Var("googlecode_url") % "open-vcdiff") + "/trunk@28",
 
   "src/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@492",
+    (Var("googlecode_url") % "googletest") + "/trunk@539",
 
   "src/testing/gmock":
-    "http://googlemock.googlecode.com/svn/trunk@300",
+    "http://googlemock.googlecode.com/svn/trunk@358",
 
   "src/third_party/angle":
     (Var("googlecode_url") % "angleproject") + "/trunk@562",
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 447a138ae38b18..42b5b90ade0fca 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -49,6 +49,9 @@ class MaybeTestDisabler : public testing::EmptyTestEventListener {
 const char TestSuite::kStrictFailureHandling[] = "strict_failure_handling";
 
 TestSuite::TestSuite(int argc, char** argv) {
+#if defined(OS_WIN)
+  testing::GTEST_FLAG(catch_exceptions) = false;
+#endif
   base::EnableTerminationOnHeapCorruption();
   CommandLine::Init(argc, argv);
   testing::InitGoogleTest(&argc, argv);