Fix various problems with inline autocomplete and URLs that change length dur...

chrome/browser/net/url_fixer_upper_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "chrome/browser/net/url_fixer_upper.h"
@@ skipping 191 matching lines @@
 struct fixup_case {
   const std::string input;
   const std::string desired_tld;
   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  bar"},
   {"..www.google.com..", "", "http://www.google.com./"},
   {"http://......", "", "http://....../"},
-  {"http://host.com:ninety-two/", "", "http://host.com/"},
-  {"http://host.com:ninety-two?foo", "", "http://host.com/?foo"},
+  {"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"},
   {"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"},
@@ skipping 230 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();
   fixedup = URLFixerUpper::FixupRelativeFile(dir, FilePath(relative_file_str));
   EXPECT_TRUE(IsMatchingFileURL(fixedup, full_path));
 
   // done with the subdir
   EXPECT_TRUE(file_util::Delete(full_path, false));
   EXPECT_TRUE(file_util::Delete(new_dir, true));
 }