Set 'whitespace_removed' correctly when resolving relative URLs.

third_party/WebKit/Source/platform/weborigin/KURLTest.cpp

 /*
  * Copyright (C) 2010 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 284 matching lines @@
 
   // Encoding should not NFC-normalize the string.
   // Contain a combining character ('e' + COMBINING OGONEK).
   String combining(String::FromUTF8("\x65\xCC\xA8"));
   EXPECT_EQ(EncodeWithURLEscapeSequences(combining), "e%CC%A8");
   // Contain a precomposed character corresponding to |combining|.
   String precomposed(String::FromUTF8("\xC4\x99"));
   EXPECT_EQ(EncodeWithURLEscapeSequences(precomposed), "%C4%99");
 }
 
-TEST(KURLTest, RemoveWhitespace) {
+TEST(KURLTest, AbsoluteRemoveWhitespace) {
   struct {
     const char* input;
     const char* expected;
   } cases[] = {
       {"ht\ntps://example.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
       {"ht\ttps://example.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
       {"ht\rtps://example.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
       {"https://exa\nmple.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
       {"https://exa\tmple.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
       {"https://exa\rmple.com/yay?boo#foo", "https://example.com/yay?boo#foo"},
@@ skipping 10 matching lines @@
 
   for (const auto& test : cases) {
     const KURL input(kParsedURLString, test.input);
     const KURL expected(kParsedURLString, test.expected);
     EXPECT_EQ(input, expected);
     EXPECT_TRUE(input.WhitespaceRemoved());
     EXPECT_FALSE(expected.WhitespaceRemoved());
   }
 }
 
+TEST(KURLTest, RelativeRemoveWhitespace) {
+  struct {
+    const char* base;
+    const char* relative;
+    bool whitespace_removed;
+  } cases[] = {
+      {"http://example.com/", "/path", false},
+      {"http://example.com/", "\n/path", true},
+      {"http://example.com/", "\r/path", true},
+      {"http://example.com/", "\t/path", true},
+      {"http://example.com/", "/pa\nth", true},
+      {"http://example.com/", "/pa\rth", true},
+      {"http://example.com/", "/pa\tth", true},
+      {"http://example.com/", "/path\n", true},
+      {"http://example.com/", "/path\r", true},
+      {"http://example.com/", "/path\t", true},
+  };
+
+  for (const auto& test : cases) {
+    SCOPED_TRACE(::testing::Message() << test.base << ", " << test.relative);
+    const KURL base(kParsedURLString, test.base);
+    const KURL expected(kParsedURLString, "http://example.com/path");
+    const KURL actual(base, test.relative);
+    EXPECT_EQ(actual, expected);
+    EXPECT_EQ(test.whitespace_removed, actual.WhitespaceRemoved());
+  }
+}
+
 TEST(KURLTest, ResolveEmpty) {
   KURL empty_base;
 
   // WebKit likes to be able to resolve absolute input agains empty base URLs,
   // which would normally be invalid since the base URL is invalid.
   const char kAbs[] = "http://www.google.com/";
   KURL resolve_abs(empty_base, kAbs);
   EXPECT_TRUE(resolve_abs.IsValid());
   EXPECT_STREQ(kAbs, resolve_abs.GetString().Utf8().data());
 
@@ skipping 409 matching lines @@
   };
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(referrer_cases); i++) {
     KURL kurl(kParsedURLString, referrer_cases[i].input);
     String referrer = kurl.StrippedForUseAsReferrer();
     EXPECT_STREQ(referrer_cases[i].output, referrer.Utf8().data());
   }
 }
 
 }  // namespace blink