Update googletest version to v1.8.1

Bazel builds of test/cpp/end2end:end2end_test were failing on Mac OS with v1.8.0 due to missing gtest symbols. The issue is not seen in v1.8.1. A WORKSPACE file was added to gtest repo in 1.8.1, so gtest.BUILD can be removed.

bazel/grpc_deps.bzl

@@ -66,11 +66,6 @@ def grpc_deps():
         actual = "@com_github_google_googletest//:gtest",
     )
 
-    native.bind(
-        name = "gmock",
-        actual = "@com_github_google_googletest//:gmock",
-    )
-
     native.bind(
         name = "benchmark",
         actual = "@com_github_google_benchmark//:benchmark",
@@ -144,10 +139,9 @@ def grpc_deps():
     if "com_github_google_googletest" not in native.existing_rules():
         http_archive(
             name = "com_github_google_googletest",
-            build_file = "@com_github_grpc_grpc//third_party:gtest.BUILD",
-            sha256 = "175a22300b3450e27e5f2e6f95cc9abca74617cbc21a1e0ed19bdfbd22ea0305",
-            strip_prefix = "googletest-ec44c6c1675c25b9827aacd08c02433cccde7780",
-            url = "https://github.com/google/googletest/archive/ec44c6c1675c25b9827aacd08c02433cccde7780.tar.gz",
+            sha256 = "d0d447b4feeedca837a0d46a289d4223089b32ac2f84545fa4982755cc8919be",
+            strip_prefix = "googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2",
+            url = "https://github.com/google/googletest/archive/2fe3bd994b3189899d93f1d5a881e725e046fdc2.tar.gz",
         )
 
     if "com_github_gflags_gflags" not in native.existing_rules():

test/cpp/end2end/BUILD

@@ -369,7 +369,6 @@ grpc_cc_test(
     name = "mock_test",
     srcs = ["mock_test.cc"],
     external_deps = [
-        "gmock",
         "gtest",
     ],
     deps = [
@@ -406,7 +405,6 @@ grpc_cc_test(
     name = "client_lb_end2end_test",
     srcs = ["client_lb_end2end_test.cc"],
     external_deps = [
-        "gmock",
         "gtest",
     ],
     deps = [
@@ -427,7 +425,6 @@ grpc_cc_test(
     name = "service_config_end2end_test",
     srcs = ["service_config_end2end_test.cc"],
     external_deps = [
-        "gmock",
         "gtest",
     ],
     deps = [
@@ -447,7 +444,6 @@ grpc_cc_test(
     name = "grpclb_end2end_test",
     srcs = ["grpclb_end2end_test.cc"],
     external_deps = [
-        "gmock",
         "gtest",
     ],
     deps = [
@@ -469,7 +465,6 @@ grpc_cc_test(
     name = "xds_end2end_test",
     srcs = ["xds_end2end_test.cc"],
     external_deps = [
-        "gmock",
         "gtest",
     ],
     deps = [
@@ -594,7 +589,6 @@ grpc_cc_test(
     srcs = ["server_load_reporting_end2end_test.cc"],
     external_deps = [
         "gtest",
-        "gmock",
     ],
     deps = [
         "//:grpcpp_server_load_reporting",

test/cpp/ext/filters/census/BUILD

@@ -26,7 +26,6 @@ grpc_cc_test(
     ],
     external_deps = [
         "gtest",
-        "gmock",
         "opencensus-stats-test",
     ],
     language = "C++",

test/cpp/naming/BUILD

@@ -37,7 +37,7 @@ grpc_py_binary(
 grpc_cc_test(
     name = "cancel_ares_query_test",
     srcs = ["cancel_ares_query_test.cc"],
-    external_deps = ["gmock"],
+    external_deps = ["gtest"],
     deps = [
         ":dns_test_util",
         "//:gpr",

test/cpp/naming/generate_resolver_component_tests.bzl

@@ -23,7 +23,7 @@ def generate_resolver_component_tests():
             "address_sorting_test.cc",
         ],
         external_deps = [
-            "gmock",
+            "gtest",
         ],
         deps = [
             "//test/cpp/util:test_util%s" % unsecure_build_config_suffix,
@@ -43,7 +43,7 @@ def generate_resolver_component_tests():
             "resolver_component_test.cc",
         ],
         external_deps = [
-            "gmock",
+            "gtest",
         ],
         deps = [
             ":dns_test_util",

test/cpp/server/load_reporter/BUILD

@@ -35,7 +35,6 @@ grpc_cc_test(
     srcs = ["load_reporter_test.cc"],
     external_deps = [
         "gtest",
-        "gmock",
         "opencensus-stats-test",
     ],
     deps = [

third_party/googletest

@@ -1 +1 @@
-Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780
+Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2

third_party/gtest.BUILD

@@ -1,42 +0,0 @@
-cc_library(
-    name = "gtest",
-    srcs = [
-        "googletest/src/gtest-all.cc",
-    ],
-    hdrs = glob([
-        "googletest/include/**/*.h",
-        "googletest/src/*.cc",
-        "googletest/src/*.h",
-    ]),
-    includes = [
-        "googletest",
-        "googletest/include",
-    ],
-    linkstatic = 1,
-    visibility = [
-        "//visibility:public",
-    ],
-)
-
-cc_library(
-    name = "gmock",
-    srcs = [
-        "googlemock/src/gmock-all.cc"
-    ],
-    hdrs = glob([
-        "googlemock/include/**/*.h",
-        "googlemock/src/*.cc",
-        "googlemock/src/*.h"
-    ]),
-    includes = [
-        "googlemock",
-        "googlemock/include",
-    ],
-    deps = [
-        ":gtest",
-    ],
-    linkstatic = 1,
-    visibility = [
-        "//visibility:public",
-    ],
-)

tools/run_tests/sanity/check_submodules.sh

@@ -35,7 +35,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
  911001cdca003337bdb93fab32740cde61bafee3 third_party/data-plane-api (heads/master)
  28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81)
  80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb)
- ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
+ 2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/googletest (release-1.8.1)
  6599cac0965be8e5a835ab7a5684bbef033d5ad0 third_party/libcxx (heads/release_60)
  9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60)
  09745575a923640154bcf307fba8aedff47f240a third_party/protobuf (v3.7.0-rc.2-247-g09745575)