Bring in googleurl changes which fix URL parsing layout test.

net/base/net_util_unittest.cc

 // Copyright (c) 2006-2008 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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
@@ skipping 89 matching lines @@
     {L"\\\\foo\\bar.txt", L"file:////foo\\bar.txt"},
     {L"\\\\foo\\bar.txt", L"file:/foo/bar.txt"},
     {L"\\\\foo\\bar.txt", L"file://foo\\bar.txt"},
     {L"C:\\foo\\bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
 #elif defined(OS_POSIX)
     {L"/c:/foo/bar.txt", L"file:/c:/foo/bar.txt"},
     {L"/c:/foo/bar.txt", L"file:///c:/foo/bar.txt"},
     {L"/foo/bar.txt", L"file:/foo/bar.txt"},
     {L"/c:/foo/bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
     {L"/foo/bar.txt", L"file:foo/bar.txt"},
-    {L"/foo/bar.txt", L"file://foo/bar.txt"},
+    {L"/bar.txt", L"file://foo/bar.txt"},
     {L"/foo/bar.txt", L"file:///foo/bar.txt"},
     {L"/foo/bar.txt", L"file:////foo/bar.txt"},
     {L"/foo/bar.txt", L"file:////foo//bar.txt"},
     {L"/foo/bar.txt", L"file:////foo///bar.txt"},
     {L"/foo/bar.txt", L"file:////foo////bar.txt"},
     {L"/c:/foo/bar.txt", L"file:\\\\\\c:/foo/bar.txt"},
     {L"/c:/foo/bar.txt", L"file:c:/foo/bar.txt"},
     // We get these wrong because GURL turns back slashes into forward
     // slashes.
     //{L"/foo%5Cbar.txt", L"file://foo\\bar.txt"},
@@ skipping 608 matching lines @@
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     const std::string results = net::GetDirectoryListingEntry(
         test_cases[i].name,
         test_cases[i].is_dir,
         test_cases[i].filesize,
         test_cases[i].time);
     EXPECT_EQ(test_cases[i].expected, results);
   }
 }
 #endif