Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

url/BUILD.gn

 # Copyright (c) 2013 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")
 import("//url/config.gni")
 
 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
 config("url_icu_config") {
   if (use_icu_alternatives_on_android) {
@@ skipping 40 matching lines @@
     "url_export.h",
     "url_file.h",
     "url_parse_file.cc",
     "url_parse_internal.h",
     "url_util.cc",
     "url_util.h",
   ]
 
   defines = [ "URL_IMPLEMENTATION" ]
 
-  configs += [
-    ":url_icu_config",
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  configs += [ ":url_icu_config" ]
+
+  if (is_win) {
+    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  }
 
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//third_party/icu:icudata",
     "//third_party/icu",
   ]
 
   if (use_icu_alternatives_on_android) {
     sources -= [
@@ skipping 18 matching lines @@
     sources = [
       "gurl_unittest.cc",
       "origin_unittest.cc",
       "url_canon_icu_unittest.cc",
       "url_canon_unittest.cc",
       "url_parse_unittest.cc",
       "url_test_utils.h",
       "url_util_unittest.cc",
     ]
 
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
     #if (is_posix && !is_mac && !is_ios) {
     #  if (use_allocator!="none") {
     #    deps += "//base/allocator"
     #  }
     #}
 
+    if (is_win) {
+      cflags = [
+        # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+        "/wd4267",
+      ]
+    }
+
     deps = [
       ":url",
       "//base",
       "//base/test:run_all_unittests",
       "//testing/gtest",
       "//third_party/icu:icuuc",
     ]
 
     if (use_icu_alternatives_on_android) {
       sources -= [ "url_canon_icu_unittest.cc" ]
       deps -= [ "//third_party/icu:icuuc" ]
     }
   }
 }