[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/+/2518775 Reviewed-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}
qweri0p · Nov 18, 2020 · 35f1e6b · 35f1e6b
1 parent e86524c
commit 35f1e6b
Show file tree

Hide file tree

Showing 13 changed files with 2,552 additions and 428 deletions.
diff --git a/DEPS b/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':

diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
@@ -460,14 +460,14 @@ 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",
       "//components/exo",
       "//components/exo/wayland",
       "//content/public/browser",
       "//services/viz/privileged/mojom/compositing",
+      "//third_party/grpc:grpc++",
       "//ui/display/manager",
     ]
   }

diff --git a/chromecast/browser/accessibility/flutter/BUILD.gn b/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",
   ]
 }

diff --git a/chromecast/browser/accessibility/proto/BUILD.gn b/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",
   ]
 

diff --git a/chromecast/browser/webview/client/BUILD.gn b/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++",
   ]
 }
diff --git a/chromecast/browser/webview/proto/BUILD.gn b/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" ]
 }