To show IDN in view-source URLs, add special handling for view-source scheme in

net::FormatUrl().

TEST=add a unit test
BUG=3991
Original review: http://codereview.chromium.org/118071
Checked in for tkent@google.com


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17661 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 81 insertions, 1 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 3139acb..0b2f243 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -651,6 +651,49 @@ void IDNToUnicodeOneComponent(const char16* comp,
     (*out)[host_begin_in_output + i] = comp[i];
 }
 
+// Helper for FormatUrl().
+std::wstring FormatViewSourceUrl(const GURL& url,
+                                 const std::wstring& languages,
+                                 bool omit_username_password,
+                                 UnescapeRule::Type unescape_rules,
+                                 url_parse::Parsed* new_parsed,
+                                 size_t* prefix_end) {
+  DCHECK(new_parsed);
+  const wchar_t* const kWideViewSource = L"view-source:";
+  const size_t kViewSourceLengthPlus1 = 12;
+
+  GURL real_url(url.possibly_invalid_spec().substr(kViewSourceLengthPlus1));
+  std::wstring result = net::FormatUrl(real_url, languages,
+      omit_username_password, unescape_rules, new_parsed, prefix_end);
+  result.insert(0, kWideViewSource);
+
+  // Adjust position values.
+  if (prefix_end)
+    *prefix_end += kViewSourceLengthPlus1;
+  if (new_parsed->scheme.is_nonempty()) {
+    // Assume "view-source:real-scheme" as a scheme.
+    new_parsed->scheme.len += kViewSourceLengthPlus1;
+  } else {
+    new_parsed->scheme.begin = 0;
+    new_parsed->scheme.len = kViewSourceLengthPlus1 - 1;
+  }
+  if (new_parsed->username.is_nonempty())
+    new_parsed->username.begin += kViewSourceLengthPlus1;
+  if (new_parsed->password.is_nonempty())
+    new_parsed->password.begin += kViewSourceLengthPlus1;
+  if (new_parsed->host.is_nonempty())
+    new_parsed->host.begin += kViewSourceLengthPlus1;
+  if (new_parsed->port.is_nonempty())
+    new_parsed->port.begin += kViewSourceLengthPlus1;
+  if (new_parsed->path.is_nonempty())
+    new_parsed->path.begin += kViewSourceLengthPlus1;
+  if (new_parsed->query.is_nonempty())
+    new_parsed->query.begin += kViewSourceLengthPlus1;
+  if (new_parsed->ref.is_nonempty())
+    new_parsed->ref.begin += kViewSourceLengthPlus1;
+  return result;
+}
+
 }  // namespace
 
 namespace net {
@@ -1123,6 +1166,17 @@ std::wstring FormatUrl(const GURL& url,
     return url_string;
   }
 
+  // Special handling for view-source:.  Don't use chrome::kViewSourceScheme
+  // because this library shouldn't depend on chrome.
+  const char* const kViewSource = "view-source";
+  const char* const kViewSourceTwice = "view-source:view-source:";
+  // Rejects view-source:view-source:... to avoid deep recursive call.
+  if (url.SchemeIs(kViewSource) &&
+      !StartsWithASCII(url.possibly_invalid_spec(), kViewSourceTwice, false)) {
+    return FormatViewSourceUrl(url, languages, omit_username_password,
+        unescape_rules, new_parsed, prefix_end);
+  }
+
   // We handle both valid and invalid URLs (this will give us the spec
   // regardless of validity).
   const std::string& spec = url.possibly_invalid_spec();
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index 0b92058..78f7ab9 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -1109,13 +1109,24 @@ TEST(NetUtilTest, FormatUrl) {
     {"Unescape normally including unescape spaces",
      "http://www.google.com/search?q=Hello%20World", L"en", true,
      UnescapeRule::SPACES,
-     L"http://www.google.com/search?q=Hello World", 7}
+     L"http://www.google.com/search?q=Hello World", 7},
+
     /*
     {"unescape=true with some special characters",
     "http://user%3A:%40passwd@example.com/foo%3Fbar?q=b%26z", L"", false, true,
     L"http://user%3A:%40passwd@example.com/foo%3Fbar?q=b%26z", 25},
     */
     // Disabled: the resultant URL becomes "...user%253A:%2540passwd...".
+
+    // -------- view-source: --------
+    {"view-source",
+     "view-source:http://xn--qcka1pmc.jp/", L"ja", true, UnescapeRule::NORMAL,
+     L"view-source:http://\x30B0\x30FC\x30B0\x30EB.jp/", 12 + 7},
+
+    {"view-source of view-source",
+     "view-source:view-source:http://xn--qcka1pmc.jp/", L"ja", true,
+     UnescapeRule::NORMAL,
+     L"view-source:view-source:http://xn--qcka1pmc.jp/", 12},
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
@@ -1185,4 +1196,19 @@ TEST(NetUtilTest, FormatUrlParsed) {
   EXPECT_EQ(L"q=\x30B0",
       formatted.substr(parsed.query.begin, parsed.query.len));
   EXPECT_EQ(L"\x30B0", formatted.substr(parsed.ref.begin, parsed.ref.len));
+
+  // View-source case.
+  formatted = net::FormatUrl(
+      GURL("view-source:http://user:passwd@host:81/path?query#ref"),
+      L"", true, UnescapeRule::NORMAL, &parsed, NULL);
+  EXPECT_EQ(L"view-source:http://host:81/path?query#ref", formatted);
+  EXPECT_EQ(L"view-source:http",
+      formatted.substr(parsed.scheme.begin, parsed.scheme.len));
+  EXPECT_FALSE(parsed.username.is_valid());
+  EXPECT_FALSE(parsed.password.is_valid());
+  EXPECT_EQ(L"host", formatted.substr(parsed.host.begin, parsed.host.len));
+  EXPECT_EQ(L"81", formatted.substr(parsed.port.begin, parsed.port.len));
+  EXPECT_EQ(L"/path", formatted.substr(parsed.path.begin, parsed.path.len));
+  EXPECT_EQ(L"query", formatted.substr(parsed.query.begin, parsed.query.len));
+  EXPECT_EQ(L"ref", formatted.substr(parsed.ref.begin, parsed.ref.len));
 }