Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

third_party/protobuf/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 if (is_win) {
   config_h_dir = "vsprojects"
 } else {
   config_h_dir = "."
 }
 
 config("protobuf_config") {
   include_dirs = [
     "src",
     config_h_dir,
   ]
   defines = [
     "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") {
   config("protobuf_use_dlls") {
     defines = [ "PROTOBUF_USE_DLLS" ]
   }
 }
 
 # This config should be applied to targets using generated code from the proto
 # compiler. It sets up the include directories properly.
@@ skipping 56 matching lines @@
 }
 
 component("protobuf_lite") {
   sources = protobuf_lite_sources
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   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
 
   # Required for component builds. See http://crbug.com/172800.
   if (component_mode == "shared_library") {
     public_configs += [ ":protobuf_use_dlls" ]
     defines = [ "LIBPROTOBUF_EXPORTS" ]
   }
 }
 
@@ skipping 58 matching lines @@
     "src/google/protobuf/io/zero_copy_stream_impl.cc",
     "src/google/protobuf/compiler/importer.cc",
     "src/google/protobuf/compiler/parser.cc",
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   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
 }
 
 # Only compile the compiler for the host architecture.
 if (current_toolchain == host_toolchain) {
   executable("protoc") {
     sources = [
       "src/google/protobuf/compiler/code_generator.cc",
       "src/google/protobuf/compiler/command_line_interface.cc",
@@ skipping 61 matching lines @@
     }
 
     cflags = protobuf_lite_cflags
 
     deps = [
       ":protobuf_full",
     ]
     deps += [ "//build/config/sanitizers:deps" ]
   }
 }