Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/secondary/third_party/cacheinvalidation/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.
 
 import("//testing/test.gni")
 
 config("cacheinvalidation_config") {
   include_dirs = [
     "overrides",
     "src",
@@ skipping 59 matching lines @@
     "src/google/cacheinvalidation/impl/throttle.h",
     "src/google/cacheinvalidation/impl/ticl-message-validator.cc",
     "src/google/cacheinvalidation/impl/ticl-message-validator.h",
     "src/google/cacheinvalidation/include/invalidation-client.h",
     "src/google/cacheinvalidation/include/invalidation-client-factory.h",
     "src/google/cacheinvalidation/include/invalidation-listener.h",
     "src/google/cacheinvalidation/include/system-resources.h",
     "src/google/cacheinvalidation/include/types.h",
   ]
 
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
   public_configs = [ ":cacheinvalidation_config" ]
 
   deps = [
     "src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
     "//base",
   ]
+
+  if (is_win) {
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    cflags = [ "/wd4267" ]
+  }
 }
 
 test("cacheinvalidation_unittests") {
   sources = [
     "src/google/cacheinvalidation/test/deterministic-scheduler.cc",
     "src/google/cacheinvalidation/test/deterministic-scheduler.h",
     "src/google/cacheinvalidation/test/test-logger.cc",
     "src/google/cacheinvalidation/test/test-logger.h",
     "src/google/cacheinvalidation/test/test-utils.cc",
     "src/google/cacheinvalidation/test/test-utils.h",
@@ skipping 36 matching lines @@
   android_library("cacheinvalidation_javalib") {
     deps = [
       ":cacheinvalidation_proto_java",
       "//third_party/android_protobuf:protobuf_nano_javalib",
       "//third_party/android_tools:android_gcm_java",
     ]
 
     DEPRECATED_java_in_dir = "src/java"
   }
 }