Support URL fragment resolution againt non-hierarchical schemes

url/url_canon_unittest.cc

 // 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.
 
 #include <errno.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/source/common/unicode/ucnv.h"
 #include "url/url_canon.h"
 #include "url/url_canon_icu.h"
@@ skipping 1682 matching lines @@
 
 TEST(URLCanonTest, CanonicalizePathURL) {
   // Path URLs should get canonicalized schemes but nothing else.
   struct PathCase {
     const char* input;
     const char* expected;
   } path_cases[] = {
     {"javascript:", "javascript:"},
     {"JavaScript:Foo", "javascript:Foo"},
     {":\":This /is interesting;?#", ":\":This /is interesting;?#"},
+    {"data:text/html, one ? two # ", "data:text/html, one ? two #"},
   };
 
   for (size_t i = 0; i < ARRAYSIZE(path_cases); i++) {
     int url_len = static_cast<int>(strlen(path_cases[i].input));
     url_parse::Parsed parsed;
     url_parse::ParsePathURL(path_cases[i].input, url_len, &parsed);
 
     url_parse::Parsed out_parsed;
     std::string out_str;
     url_canon::StdStringCanonOutput output(&out_str);
     bool success = url_canon::CanonicalizePathURL(path_cases[i].input, url_len,
                                                   parsed, &output,
                                                   &out_parsed);
     output.Complete();
 
     EXPECT_TRUE(success);
     EXPECT_EQ(path_cases[i].expected, out_str);
 
     EXPECT_EQ(0, out_parsed.host.begin);
     EXPECT_EQ(-1, out_parsed.host.len);
 
     // When we end with a colon at the end, there should be no path.
     if (path_cases[i].input[url_len - 1] == ':') {
-      EXPECT_EQ(0, out_parsed.path.begin);
-      EXPECT_EQ(-1, out_parsed.path.len);
+      EXPECT_EQ(0, out_parsed.Content().begin);
+      EXPECT_EQ(-1, out_parsed.Content().len);
     }
   }
 }
 
 TEST(URLCanonTest, CanonicalizeMailtoURL) {
   struct URLCase {
     const char* input;
     const char* expected;
     bool expected_success;
     url_parse::Component expected_path;
@@ skipping 361 matching lines @@
   url_canon::StdStringCanonOutput repl_output(&repl_str);
   url_canon::ReplaceFileURL(src, parsed, repl, NULL, &repl_output, &repl_parsed);
   repl_output.Complete();
 
   // Generate the expected string and check.
   std::string expected("file:///foo?");
   for (size_t i = 0; i < new_query.length(); i++)
     expected.push_back('a');
   EXPECT_TRUE(expected == repl_str);
 }