Revise about: and chrome: url handling.

chrome/browser/net/url_fixer_upper_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <stdlib.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 38 matching lines @@
     url_parse::Component(7, 14), // host
     url_parse::Component(), // port
     url_parse::Component(21, 1), // path
     url_parse::Component(), // query
     url_parse::Component(), // ref
   },
   { "aBoUt:vErSiOn", "about",
     url_parse::Component(0, 5), // scheme
     url_parse::Component(), // username
     url_parse::Component(), // password
-    url_parse::Component(), // host
+    url_parse::Component(6, 7), // host
     url_parse::Component(), // port
     url_parse::Component(), // path
     url_parse::Component(), // query
     url_parse::Component(), // ref
   },
+  { "about:host/path?query#ref", "about",
+    url_parse::Component(0, 5), // scheme
+    url_parse::Component(), // username
+    url_parse::Component(), // password
+    url_parse::Component(6, 4), // host
+    url_parse::Component(), // port
+    url_parse::Component(10, 5), // path
+    url_parse::Component(16, 5), // query
+    url_parse::Component(22, 3), // ref
+  },
+  { "about://host/path?query#ref", "about",
+    url_parse::Component(0, 5), // scheme
+    url_parse::Component(), // username
+    url_parse::Component(), // password
+    url_parse::Component(8, 4), // host
+    url_parse::Component(), // port
+    url_parse::Component(12, 5), // path
+    url_parse::Component(18, 5), // query
+    url_parse::Component(24, 3), // ref
+  },
+  { "chrome:host/path?query#ref", "chrome",
+    url_parse::Component(0, 6), // scheme
+    url_parse::Component(), // username
+    url_parse::Component(), // password
+    url_parse::Component(7, 4), // host
+    url_parse::Component(), // port
+    url_parse::Component(11, 5), // path
+    url_parse::Component(17, 5), // query
+    url_parse::Component(23, 3), // ref
+  },
+  { "chrome://host/path?query#ref", "chrome",
+    url_parse::Component(0, 6), // scheme
+    url_parse::Component(), // username
+    url_parse::Component(), // password
+    url_parse::Component(9, 4), // host
+    url_parse::Component(), // port
+    url_parse::Component(13, 5), // path
+    url_parse::Component(19, 5), // query
+    url_parse::Component(25, 3), // ref
+  },
   { "    www.google.com:124?foo#", "http",
     url_parse::Component(), // scheme
     url_parse::Component(), // username
     url_parse::Component(), // password
     url_parse::Component(4, 14), // host
     url_parse::Component(19, 3), // port
     url_parse::Component(), // path
     url_parse::Component(23, 3), // query
     url_parse::Component(27, 0), // ref
   },
@@ skipping 135 matching lines @@
   const std::string output;
 } fixup_cases[] = {
   {"www.google.com", "", "http://www.google.com/"},
   {" www.google.com     ", "", "http://www.google.com/"},
   {" foo.com/asdf  bar", "", "http://foo.com/asdf%20%20bar"},
   {"..www.google.com..", "", "http://www.google.com./"},
   {"http://......", "", "http://....../"},
   {"http://host.com:ninety-two/", "", "http://host.com:ninety-two/"},
   {"http://host.com:ninety-two?foo", "", "http://host.com:ninety-two/?foo"},
   {"google.com:123", "", "http://google.com:123/"},
-  {"about:", "", "about:"},
-  {"about:version", "", "about:version"},
+  {"about:", "", "chrome://version/"},
+  {"about:foo", "", "chrome://foo/"},
+  {"about:version", "", "chrome://version/"},
+  {"about:usr:pwd@hst/pth?qry#ref", "", "chrome://usr:pwd@hst/pth?qry#ref"},
+  {"about://usr:pwd@hst/pth?qry#ref", "", "chrome://usr:pwd@hst/pth?qry#ref"},
+  {"chrome:usr:pwd@hst/pth?qry#ref", "", "chrome://usr:pwd@hst/pth?qry#ref"},
+  {"chrome://usr:pwd@hst/pth?qry#ref", "", "chrome://usr:pwd@hst/pth?qry#ref"},
   {"www:123", "", "http://www:123/"},
   {"   www:123", "", "http://www:123/"},
   {"www.google.com?foo", "", "http://www.google.com/?foo"},
   {"www.google.com#foo", "", "http://www.google.com/#foo"},
   {"www.google.com?", "", "http://www.google.com/?"},
   {"www.google.com#", "", "http://www.google.com/#"},
   {"www.google.com:123?foo#bar", "", "http://www.google.com:123/?foo#bar"},
   {"user@www.google.com", "", "http://user@www.google.com/"},
   {"\xE6\xB0\xB4.com" , "", "http://xn--1rw.com/"},
   // It would be better if this next case got treated as http, but I don't see
@@ skipping 232 matching lines @@
   // (should resolve to the same file as above)
   relative_file_str = sub_dir.value() + FILE_PATH_LITERAL("/../") +
       sub_dir.value() + FILE_PATH_LITERAL("///./") + sub_file.value();
   EXPECT_TRUE(IsMatchingFileURL(URLFixerUpper::FixupRelativeFile(dir,
       FilePath(relative_file_str)).possibly_invalid_spec(), full_path));
 
   // done with the subdir
   EXPECT_TRUE(file_util::Delete(full_path, false));
   EXPECT_TRUE(file_util::Delete(new_dir, true));
 }