[third_party] Uprev grpc to v1.33.0+

Bug: b/132440534
Test: CQ and manual size check.
Change-Id: Ie892c66dd5773e93ed154d3754add455e1f47041
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518775Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Sean Topping <seantopping@chromium.org>
Reviewed-by: Luke Halliwell (slow) <halliwell@chromium.org>
Commit-Queue: Andres Medina <medinaandres@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828763}

DEPS

@@ -942,7 +942,7 @@ deps = {
   },
 
   'src/third_party/grpc/src': {
-      'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '74b981a6a3d9ba17f3acae1d72b9109325ef656d',
+      'url': Var('chromium_git') + '/external/github.com/grpc/grpc.git' + '@' + '4ac9c6f755463a2321f84b0cb2d631e1828faedb',
   },
 
   'src/third_party/freetype/src':

chromecast/browser/BUILD.gn

@@ -460,7 +460,6 @@ cast_source_set("browser") {
       "webview/webview_window_manager.cc",
       "webview/webview_window_manager.h",
     ]
-    configs += [ "//third_party/grpc:grpc_config" ]
     deps += [
       ":web_contents_provider",
       "//chromecast/browser/webview/proto",
@@ -468,6 +467,7 @@ cast_source_set("browser") {
       "//components/exo/wayland",
       "//content/public/browser",
       "//services/viz/privileged/mojom/compositing",
+      "//third_party/grpc:grpc++",
       "//ui/display/manager",
     ]
   }

chromecast/browser/accessibility/flutter/BUILD.gn

@@ -26,7 +26,7 @@ cast_source_set("accessibility") {
     "//content/public/browser",
     "//extensions/browser/api",
     "//skia",
-    "//third_party/grpc:grpcpp",
+    "//third_party/grpc:grpc++",
     "//ui/views",
   ]
 }

chromecast/browser/accessibility/proto/BUILD.gn

@@ -7,7 +7,7 @@ proto_library("gallium_accessibility_proto") {
   ]
 
   deps = [
-    "//third_party/grpc:grpcpp",
+    "//third_party/grpc:grpc++",
     "//third_party/protobuf:protobuf_lite",
   ]
 

chromecast/browser/webview/client/BUILD.gn

@@ -21,5 +21,6 @@ executable("wayland_webview_client") {
     "//ui/events:events_base",
     "//ui/events/types:headers",
     "//ui/gl",
+    "//third_party/grpc:grpc++",
   ]
 }

chromecast/browser/webview/proto/BUILD.gn

@@ -4,6 +4,6 @@
 
 import("//third_party/grpc/grpc_library.gni")
 
-cc_grpc_library("proto") {
+grpc_library("proto") {
   sources = [ "webview.proto" ]
 }

third_party/grpc/README.chromium

-Name: gRPC
+Name: grpc
 URL: https://github.com/grpc/grpc
-Version: 0
-Date: Jul 16, 2019
-Revision: 74b981a6a3d9ba17f3acae1d72b9109325ef656d
 License: Apache 2.0
-License File: LICENSE
+Version: v1.33.0+
+Revision: 4ac9c6f755463a2321f84b0cb2d631e1828faedb
 Security Critical: yes
 
-Description:
-gRPC is a library to make remote procedure calls (RPC) between server and client
-applications. This is currently used by Chrome Remote Desktop during the
-signaling process.
-
-Local Modifications:
-None
+Steps to upgrade to a new version of GRPC:
+1. Merge origin/grpc/master into eureka/master branch.
+2. Update revision and version information in this file.
+4. Checkout GRPC submodules with: git submodule update --init
+5. Copy template/BUILD.chromium.gn.template to src/templates
+6. Rebuild BUILD.gn by running tools/buildgen/generate_projects.sh
+    (make sure mako_templates python module is installed in your system)
+   and then running gn format BUILD.gn. This will use the template in
+   templates/BUILD.chromium.gn.template to generate BUILD.chromium.gn file.
+4. Do:
+  mv third_party/grpc/src/BUILD.chromium.gn BUILD.gn
+6. Update plugin_register. Ensure xds_resolver and all lb_policies are
+disabled except first_pick.
+5. Run 'gn format --in-place BUILD.gn'

third_party/grpc/grpc_library.gni

-# Copyright 2019 The Chromium Authors. All rights reserved.
+# Copyright 2019 Google Inc. All Rights Reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# Compile a grpc service.
+#
+# Example:
+#  grpc_library("mylib") {
+#    sources = [
+#      "foo.proto",
+#    ]
+#  }
+
+import("//build/config/sanitizers/sanitizers.gni")
 import("//third_party/protobuf/proto_library.gni")
 
-# Compiles a protocol buffer into gRPC C++ interface.
-#
-# Example
-#   cc_grpc_library("mylib") {
-#     sources = [
-#       "foo.proto",
-#     ]
-#   }
-template("cc_grpc_library") {
-  proto_library_name = "${target_name}_proto_lib"
-  proto_library(proto_library_name) {
+template("grpc_library") {
+  assert(defined(invoker.sources), "Need sources for proto_library")
+  proto_library(target_name) {
     forward_variables_from(invoker,
                            [
-                             "defines",
-                             "deps",
-                             "sources",
-                             "use_protobuf_full",
+                             "cc_include",
+                             "extra_configs",
+                             "generator_plugin_label",
+                             "generator_plugin_suffix",
+                             "generate_python",
                              "import_dirs",
+                             "link_deps",
                              "proto_in_dir",
+                             "proto_out_dir",
+                             "sources",
+                             "testonly",
+                             "visibility",
+                             "deps",
+                             "proto_deps",
                            ])
-    remove_configs = [ "//build/config/compiler:chromium_code" ]
-    extra_configs = [
-      "//build/config/compiler:no_chromium_code",
-      "//third_party/grpc:grpc_config",
-    ]
-    generate_python = false
+
+    if (defined(invoker.use_protobuf_full)) {
+      use_protobuf_full = invoker.use_protobuf_full
+    } else {
+      cc_generator_options = "lite"
+    }
+
+    extra_configs = ["//third_party/grpc:grpc_config"]
+
+    generate_cc = true
+
     generator_plugin_label = "//third_party/grpc:grpc_cpp_plugin"
     generator_plugin_suffix = ".grpc.pb"
   }
-
-  # This group forces caller to depend on grpcpp, which is required when using
-  # the compiled gRPC library.
-  group(target_name) {
-    public_deps = [
-      ":${proto_library_name}",
-      "//third_party/grpc:grpcpp",
-    ]
-  }
 }

third_party/grpc/grpc_shared_lib.map

+{
+  global:
+    gpr_*;
+    extern "C++" {
+        grpc::*;
+        grpc_*;
+        tsi_*;
+        vtable*grpc::*;
+    };
+  local:
+    *;
+};

third_party/grpc/plugin_registry/grpc_plugin_registry.cc

+/*
+ *
+ * Copyright 2016 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
+void grpc_http_filters_init(void);
+void grpc_http_filters_shutdown(void);
+void grpc_chttp2_plugin_init(void);
+void grpc_chttp2_plugin_shutdown(void);
+void grpc_deadline_filter_init(void);
+void grpc_deadline_filter_shutdown(void);
+void grpc_client_channel_init(void);
+void grpc_client_channel_shutdown(void);
+void grpc_inproc_plugin_init(void);
+void grpc_inproc_plugin_shutdown(void);
+void grpc_resolver_fake_init(void);
+void grpc_resolver_fake_shutdown(void);
+void grpc_lb_policy_grpclb_init(void);
+void grpc_lb_policy_grpclb_shutdown(void);
+void grpc_lb_policy_priority_init(void);
+void grpc_lb_policy_priority_shutdown(void);
+void grpc_lb_policy_weighted_target_init(void);
+void grpc_lb_policy_weighted_target_shutdown(void);
+void grpc_lb_policy_pick_first_init(void);
+void grpc_lb_policy_pick_first_shutdown(void);
+void grpc_lb_policy_round_robin_init(void);
+void grpc_lb_policy_round_robin_shutdown(void);
+void grpc_resolver_dns_ares_init(void);
+void grpc_resolver_dns_ares_shutdown(void);
+void grpc_resolver_dns_native_init(void);
+void grpc_resolver_dns_native_shutdown(void);
+void grpc_resolver_sockaddr_init(void);
+void grpc_resolver_sockaddr_shutdown(void);
+void grpc_client_idle_filter_init(void);
+void grpc_client_idle_filter_shutdown(void);
+void grpc_max_age_filter_init(void);
+void grpc_max_age_filter_shutdown(void);
+void grpc_message_size_filter_init(void);
+void grpc_message_size_filter_shutdown(void);
+void grpc_service_config_channel_arg_filter_init(void);
+void grpc_service_config_channel_arg_filter_shutdown(void);
+void grpc_client_authority_filter_init(void);
+void grpc_client_authority_filter_shutdown(void);
+void grpc_workaround_cronet_compression_filter_init(void);
+void grpc_workaround_cronet_compression_filter_shutdown(void);
+
+#ifndef GRPC_NO_XDS
+namespace grpc_core {
+void XdsClientGlobalInit();
+void XdsClientGlobalShutdown();
+}  // namespace grpc_core
+void grpc_certificate_provider_registry_init(void);
+void grpc_certificate_provider_registry_shutdown(void);
+void grpc_lb_policy_cds_init(void);
+void grpc_lb_policy_cds_shutdown(void);
+void grpc_lb_policy_eds_init(void);
+void grpc_lb_policy_eds_shutdown(void);
+void grpc_lb_policy_xds_cluster_impl_init(void);
+void grpc_lb_policy_xds_cluster_impl_shutdown(void);
+void grpc_lb_policy_xds_cluster_manager_init(void);
+void grpc_lb_policy_xds_cluster_manager_shutdown(void);
+void grpc_resolver_xds_init(void);
+void grpc_resolver_xds_shutdown(void);
+#endif
+
+void grpc_register_built_in_plugins(void) {
+  grpc_register_plugin(grpc_http_filters_init, grpc_http_filters_shutdown);
+  grpc_register_plugin(grpc_chttp2_plugin_init, grpc_chttp2_plugin_shutdown);
+  grpc_register_plugin(grpc_deadline_filter_init,
+                       grpc_deadline_filter_shutdown);
+  grpc_register_plugin(grpc_client_channel_init, grpc_client_channel_shutdown);
+  grpc_register_plugin(grpc_inproc_plugin_init, grpc_inproc_plugin_shutdown);
+  grpc_register_plugin(grpc_resolver_fake_init, grpc_resolver_fake_shutdown);
+  // grpc_register_plugin(grpc_lb_policy_grpclb_init,
+  //                     grpc_lb_policy_grpclb_shutdown);
+  // grpc_register_plugin(grpc_lb_policy_priority_init,
+  //                     grpc_lb_policy_priority_shutdown);
+  // grpc_register_plugin(grpc_lb_policy_weighted_target_init,
+  //                     grpc_lb_policy_weighted_target_shutdown);
+  grpc_register_plugin(grpc_lb_policy_pick_first_init,
+                       grpc_lb_policy_pick_first_shutdown);
+  //  grpc_register_plugin(grpc_lb_policy_round_robin_init,
+  //                       grpc_lb_policy_round_robin_shutdown);
+  grpc_register_plugin(grpc_resolver_dns_ares_init,
+                       grpc_resolver_dns_ares_shutdown);
+  grpc_register_plugin(grpc_resolver_dns_native_init,
+                       grpc_resolver_dns_native_shutdown);
+  grpc_register_plugin(grpc_resolver_sockaddr_init,
+                       grpc_resolver_sockaddr_shutdown);
+  grpc_register_plugin(grpc_client_idle_filter_init,
+                       grpc_client_idle_filter_shutdown);
+  grpc_register_plugin(grpc_max_age_filter_init, grpc_max_age_filter_shutdown);
+  grpc_register_plugin(grpc_message_size_filter_init,
+                       grpc_message_size_filter_shutdown);
+  grpc_register_plugin(grpc_service_config_channel_arg_filter_init,
+                       grpc_service_config_channel_arg_filter_shutdown);
+  grpc_register_plugin(grpc_client_authority_filter_init,
+                       grpc_client_authority_filter_shutdown);
+  grpc_register_plugin(grpc_workaround_cronet_compression_filter_init,
+                       grpc_workaround_cronet_compression_filter_shutdown);
+#ifndef GRPC_NO_XDS
+  grpc_register_plugin(grpc_core::XdsClientGlobalInit,
+                       grpc_core::XdsClientGlobalShutdown);
+  grpc_register_plugin(grpc_certificate_provider_registry_init,
+                       grpc_certificate_provider_registry_shutdown);
+  grpc_register_plugin(grpc_lb_policy_cds_init, grpc_lb_policy_cds_shutdown);
+  grpc_register_plugin(grpc_lb_policy_eds_init, grpc_lb_policy_eds_shutdown);
+  grpc_register_plugin(grpc_lb_policy_xds_cluster_impl_init,
+                       grpc_lb_policy_xds_cluster_impl_shutdown);
+  grpc_register_plugin(grpc_lb_policy_xds_cluster_manager_init,
+                       grpc_lb_policy_xds_cluster_manager_shutdown);
+  grpc_register_plugin(grpc_resolver_xds_init, grpc_resolver_xds_shutdown);
+#endif
+}