Add more test cases for HttpUtil::PathForRequest() and SpecForRequest()

net/http/http_util_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "net/http/http_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 594 matching lines @@
     },
     { // The reference may itself contain # -- strip all of it.
       "http://192.168.0.1?query=1#hash#10#11#13#14",
       "http://192.168.0.1/?query=1",
       "/?query=1"
     },
     { // Strip username/password.
       "http://user:pass@google.com",
       "http://google.com/",
       "/"
-    }
+    },
+    { // https scheme
+      "https://www.google.com:78/foobar?query=1#hash",
+      "https://www.google.com:78/foobar?query=1",
+      "/foobar?query=1"
+    },
+    { // WebSocket's ws scheme
+      "ws://www.google.com:78/foobar?query=1#hash",
+      "ws://www.google.com:78/foobar?query=1",
+      "/foobar?query=1"
+    },
+    { // WebSocket's wss scheme
+      "wss://www.google.com:78/foobar?query=1#hash",
+      "wss://www.google.com:78/foobar?query=1",
+      "/foobar?query=1"
+    },
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     GURL url(GURL(tests[i].url));
     std::string expected_spec(tests[i].expected_spec);
     std::string expected_path(tests[i].expected_path);
 
     EXPECT_EQ(expected_spec, HttpUtil::SpecForRequest(url));
     EXPECT_EQ(expected_path, HttpUtil::PathForRequest(url));
   }
+
+  // ftp scheme

[Adam Rice, 2013/11/15 08:01:44]

I would prefer to have this as a separate test case, since it doesn't need to be
in this test case. You could call it SpecForFtpRequest or something similar.

[tyoshino (SeeGerritForStatus), 2013/11/15 13:35:50]

Done.

+  GURL ftp_url("ftp://user:pass@google.com/pub/chromium/");
+  EXPECT_EQ("ftp://google.com/pub/chromium/",
+            HttpUtil::SpecForRequest(ftp_url));
 }
 
 TEST(HttpUtilTest, GenerateAcceptLanguageHeader) {
   EXPECT_EQ(std::string("en-US,fr;q=0.8,de;q=0.6"),
             HttpUtil::GenerateAcceptLanguageHeader("en-US,fr,de"));
   EXPECT_EQ(std::string("en-US,fr;q=0.8,de;q=0.6,ko;q=0.4,zh-CN;q=0.2,"
                         "ja;q=0.2"),
             HttpUtil::GenerateAcceptLanguageHeader("en-US,fr,de,ko,zh-CN,ja"));
 }
 
@@ skipping 407 matching lines @@
 TEST(HttpUtilTest, NameValuePairsIteratorMissingEndQuote) {
   std::string data = "name='value";
   HttpUtil::NameValuePairsIterator parser(data.begin(), data.end(), ';');
   EXPECT_TRUE(parser.valid());
 
   ASSERT_NO_FATAL_FAILURE(
       CheckNextNameValuePair(&parser, true, true, "name", "value"));
   ASSERT_NO_FATAL_FAILURE(CheckNextNameValuePair(
       &parser, false, true, std::string(), std::string()));
 }