diff options
| author | cira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 16:35:17 +0000 |
|---|---|---|
| committer | cira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 16:35:17 +0000 |
| commit | 8f2fc94a7bf7af3f820316aa32045ad74ccc7f29 (patch) | |
| tree | 117fbd622058c65ead4e0e02f955b1aa9747c1da | |
| parent | 534c59086c951a0687fce53c2a8de49a2100867e (diff) | |
| download | chromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.zip chromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.tar.gz chromium_src-8f2fc94a7bf7af3f820316aa32045ad74ccc7f29.tar.bz2 | |
Pulling new version of googleurl into the tree.
Fixing a net_unittest case that wasn't updated when googleurl code was changed (but not down integrated to chrome).
BUG=5490
Review URL: http://codereview.chromium.org/174093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23965 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 6 |
3 files changed, 4 insertions, 6 deletions
@@ -13,7 +13,7 @@ deps = { "/trunk/deps/support@20411", "src/googleurl": - "http://google-url.googlecode.com/svn/trunk@110", + "http://google-url.googlecode.com/svn/trunk@113", "src/sdch/open-vcdiff": "http://open-vcdiff.googlecode.com/svn/trunk@26", diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index db4043a..4f0dac0 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -62,7 +62,6 @@ 'dependencies': [ 'googleurl', '../../testing/gtest.gyp:gtest', - '../../testing/gtest.gyp:gtestmain', '../../third_party/icu38/icu38.gyp:icuuc', ], 'sources': [ @@ -71,6 +70,7 @@ '../../googleurl/src/url_parse_unittest.cc', '../../googleurl/src/url_test_utils.h', '../../googleurl/src/url_util_unittest.cc', + '../../googleurl/src/gurl_test_main.cc', ], }, ], diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index d19df2c..9993b1d 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -3535,11 +3535,9 @@ TEST_F(HttpNetworkTransactionTest, GetIdentifyFromUrl) { L"use rname", L"password", }, - { // The URL canonicalizer for userinfo does not recognize non-ascii - // escapes it seems... So things like %00 will NOT be unescapable, - // since they are canonicalized by escaping the %... + { // Keep %00 as is. "http://use%00rname:password@google.com", - L"use%2500rname", + L"use%00rname", L"password", }, { // Use a '+' in the username. |