Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

This reverts commit 75d3e86468813c450c36d2320bbd7a8b2e2ba9c4.

Android mojo_shell fails to run.  It can'd find the
AndroidHandler class.  Unclear what part of this change is causing
this.  jamesr and I spent a while trying to figure out, but we're
reverting this for now to unblock the rest of the team working
on android development.

Hopefully the paris team will be able to bail us out here when
they wake. :)

R=jamesr@chromium.org,qsr@chromium.org,davemoore@chromium.org

Review URL: https://codereview.chromium.org/951673002

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 964a08b..03e90cb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -58,11 +58,11 @@
 
   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",
@@ -101,15 +101,19 @@
       "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",

url_canon.h

diff --git a/url_canon.h b/url_canon.h
index 432f291..89e3509 100644
--- a/url_canon.h
+++ b/url_canon.h
@@ -734,8 +734,8 @@
   // Returns a pointer to a static empty string that is used as a placeholder
   // to indicate a component should be deleted (see below).
   const CHAR* Placeholder() {
-    static const CHAR empty_cstr = 0;
-    return &empty_cstr;
+    static const CHAR empty_string = 0;
+    return &empty_string;
   }
 
   // We support three states: