Fix generation of inner_url in GURL::ReplacementComponents.

url/gurl_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 <stddef.h>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/url_canon.h"
@@ skipping 383 matching lines @@
     const char* scheme;
     const char* username;
     const char* password;
     const char* host;
     const char* port;
     const char* path;
     const char* query;
     const char* ref;
     const char* expected;
   } replace_cases[] = {
-    {"http://www.google.com/foo/bar.html?foo#bar", NULL, NULL, NULL, NULL, NULL, "/", "", "", "http://www.google.com/"},
-    {"http://www.google.com/foo/bar.html?foo#bar", "javascript", "", "", "", "", "window.open('foo');", "", "", "javascript:window.open('foo');"},
-    {"file:///C:/foo/bar.txt", "http", NULL, NULL, "www.google.com", "99", "/foo", "search", "ref", "http://www.google.com:99/foo?search#ref"},
+      {"http://www.google.com/foo/bar.html?foo#bar", NULL, NULL, NULL, NULL,
+       NULL, "/", "", "", "http://www.google.com/"},
+      {"http://www.google.com/foo/bar.html?foo#bar", "javascript", "", "", "",
+       "", "window.open('foo');", "", "", "javascript:window.open('foo');"},
+      {"file:///C:/foo/bar.txt", "http", NULL, NULL, "www.google.com", "99",
+       "/foo", "search", "ref", "http://www.google.com:99/foo?search#ref"},
 #ifdef WIN32
-    {"http://www.google.com/foo/bar.html?foo#bar", "file", "", "", "", "", "c:\\", "", "", "file:///C:/"},
+      {"http://www.google.com/foo/bar.html?foo#bar", "file", "", "", "", "",
+       "c:\\", "", "", "file:///C:/"},
 #endif
-    {"filesystem:http://www.google.com/foo/bar.html?foo#bar", NULL, NULL, NULL, NULL, NULL, "/", "", "", "filesystem:http://www.google.com/foo/"},
+      {"filesystem:http://www.google.com/foo/bar.html?foo#bar", NULL, NULL,
+       NULL, NULL, NULL, "/", "", "", "filesystem:http://www.google.com/foo/"},
+      // Lengthen the URL instead of shortening it, to test creation of
+      // inner_url.
+      {"filesystem:http://www.google.com/foo/", NULL, NULL, NULL, NULL, NULL,
+       "bar.html", "foo", "bar",
+       "filesystem:http://www.google.com/foo/bar.html?foo#bar"},

[mmenke, 2016/06/01 20:39:41]

Other than the addition of the last test case, the rest of this is just the
result of "git cl format"

   };
 
   for (size_t i = 0; i < arraysize(replace_cases); i++) {
     const ReplaceCase& cur = replace_cases[i];
     GURL url(cur.base);
     GURL::Replacements repl;
     SetupReplacement(&GURL::Replacements::SetScheme, &repl, cur.scheme);
     SetupReplacement(&GURL::Replacements::SetUsername, &repl, cur.username);
     SetupReplacement(&GURL::Replacements::SetPassword, &repl, cur.password);
     SetupReplacement(&GURL::Replacements::SetHost, &repl, cur.host);
     SetupReplacement(&GURL::Replacements::SetPort, &repl, cur.port);
     SetupReplacement(&GURL::Replacements::SetPath, &repl, cur.path);
     SetupReplacement(&GURL::Replacements::SetQuery, &repl, cur.query);
     SetupReplacement(&GURL::Replacements::SetRef, &repl, cur.ref);
     GURL output = url.ReplaceComponents(repl);
 
     EXPECT_EQ(replace_cases[i].expected, output.spec());
+
     EXPECT_EQ(output.SchemeIsFileSystem(), output.inner_url() != NULL);
+    if (output.SchemeIsFileSystem())
+      EXPECT_EQ(replace_cases[i].expected, output.inner_url()->spec());

[mmenke, 2016/06/01 20:39:41]

I'm not sure if the inner_url's spec is suppose to match the "outer URL's" one
(There's no test for inner_url->spec() in this file!?), but this is the behavior
for the non-ReplaceComponents case, too.

   }
 }
 
 TEST(GURLTest, ClearFragmentOnDataUrl) {
   // http://crbug.com/291747 - a data URL may legitimately have trailing
   // whitespace in the spec after the ref is cleared. Test this does not trigger
   // the Parsed importing validation DCHECK in GURL.
   GURL url(" data: one ? two # three ");
 
   // By default the trailing whitespace will have been stripped.
@@ skipping 243 matching lines @@
   };
 
   for (const auto& test : cases) {
     GURL url(test.url);
     EXPECT_EQ(test.expected, url.path()) << test.url;
     EXPECT_EQ(test.expected, url.GetContent()) << test.url;
   }
 }
 
 }  // namespace url