Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

third_party/protobuf/BUILD.gn

Index: third_party/protobuf/BUILD.gn
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
index 6825f1e0af2281b5461027bbe6a9268209604f7b..1367d8a16b7fc8df45be4d1f0c09ad6886f8c713 100644
--- a/third_party/protobuf/BUILD.gn
+++ b/third_party/protobuf/BUILD.gn
@@ -17,6 +17,11 @@ config("protobuf_config") {
     "GOOGLE_PROTOBUF_NO_RTTI",
     "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
   ]
+
+  if (is_win) {
+    # TODO(jschuh): http://crbug.com/167187 size_t -> int.
+    cflags = [ "/wd4267" ]
+  }
 }
 
 if (component_mode == "shared_library") {
@@ -93,11 +98,7 @@ component("protobuf_lite") {
   if (is_win) {
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
-  public_configs = [
-    ":protobuf_config",
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  public_configs = [ ":protobuf_config" ]
 
   cflags = protobuf_lite_cflags
 
@@ -176,11 +177,7 @@ source_set("protobuf_full") {
   if (is_win) {
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
-  public_configs = [
-    ":protobuf_config",
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  public_configs = [ ":protobuf_config" ]
 
   cflags = protobuf_lite_cflags
 }