Fix encoding of the query part of an URL [Issue 20507].

src/url_canon_relative.cc

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 333 matching lines @@
                                             out_parsed->path.end());
     return success;
   }
 
   // If we get here, the path is unchanged: copy to output.
   CopyOneComponent(base_url, base_parsed.path, output, &out_parsed->path);
 
   if (query.is_valid()) {
     // Just the query specified, replace the query and reference (ignore
     // failures for refs)
-    CanonicalizeQuery(relative_url, query, NULL, output, &out_parsed->query);
+    CanonicalizeQuery(relative_url, query, query_converter,
+                      output, &out_parsed->query);
     CanonicalizeRef(relative_url, ref, output, &out_parsed->ref);
     return success;
   }
 
   // If we get here, the query is unchanged: copy to output. Note that the
   // range of the query parameter doesn't include the question mark, so we
   // have to add it manually if there is a component.
   if (base_parsed.query.is_valid())
     output->push_back('?');
   CopyOneComponent(base_url, base_parsed.query, output, &out_parsed->query);
@@ skipping 196 matching lines @@
                         const url_parse::Component& relative_component,
                         CharsetConverter* query_converter,
                         CanonOutput* output,
                         url_parse::Parsed* out_parsed) {
   return DoResolveRelativeURL<char16>(
       base_url, base_parsed, base_is_file, relative_url,
       relative_component, query_converter, output, out_parsed);
 }
 
 }  // namespace url_canon