Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

url/url_canon.h

 // Copyright 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.
 
 #ifndef URL_URL_CANON_H_
 #define URL_URL_CANON_H_
 
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 716 matching lines @@
 
   // Getters for the itnernal data. See the variables below for how the
   // information is encoded.
   const URLComponentSource<CHAR>& sources() const { return sources_; }
   const Parsed& components() const { return components_; }
 
  private:
   // 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:
   //
   // Action                 | Source                Component
   // -----------------------+--------------------------------------------------
   // Don't change component | NULL                  (unused)
   // Replace component      | (replacement string)  (replacement component)
   // Delete component       | (non-NULL)            (invalid component: (0,-1))
   //
@@ skipping 134 matching lines @@
                                    bool base_is_file,
                                    const base::char16* relative_url,
                                    const Component& relative_component,
                                    CharsetConverter* query_converter,
                                    CanonOutput* output,
                                    Parsed* out_parsed);
 
 }  // namespace url
 
 #endif  // URL_URL_CANON_H_