diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 00:09:38 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 00:09:38 +0000 |
| commit | 15fbdb4645fc28ced45f683c0ed9c7b379fbed0c (patch) | |
| tree | d5edc503c83bfd885de5420238bec2ac8fb4fd5c | |
| parent | 0ac9c47d1863828ef490d459586a3389ac56b050 (diff) | |
| download | chromium_src-15fbdb4645fc28ced45f683c0ed9c7b379fbed0c.zip chromium_src-15fbdb4645fc28ced45f683c0ed9c7b379fbed0c.tar.gz chromium_src-15fbdb4645fc28ced45f683c0ed9c7b379fbed0c.tar.bz2 | |
net: Fix references to googleurl.
googleurl is deprecated and moved to src/url/.
BUG=229660
R=eroman@chromium.org
Review URL: https://codereview.chromium.org/19492015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212703 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/escape.cc | 2 | ||||
| -rw-r--r-- | net/base/net_util_unittest.cc | 2 | ||||
| -rw-r--r-- | net/websockets/websocket_channel.h | 2 | ||||
| -rw-r--r-- | net/websockets/websocket_channel_test.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/base/escape.cc b/net/base/escape.cc index 23b4eeb..d1b592c 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -67,7 +67,7 @@ std::string Escape(const std::string& text, const Charmap& charmap, // The basic rule is that we can't unescape anything that would changing parsing // like # or ?. We also can't unescape &, =, or + since that could be part of a // query and that could change the server's parsing of the query. Nor can we -// unescape \ since googleurl will convert it to a /. +// unescape \ since src/url/ will convert it to a /. // // Lastly, we can't unescape anything that doesn't have a canonical // representation in a URL. This means that unescaping will change the URL, and diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index bea0339..0fea0a1 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -1073,7 +1073,7 @@ TEST(NetUtilTest, GenerateFileName) { L"", L"test.html" }, - { // Now that we use googleurl's ExtractFileName, this case falls back to + { // Now that we use src/url's ExtractFileName, this case falls back to // the hostname. If this behavior is not desirable, we'd better change // ExtractFileName (in url_parse). __LINE__, diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h index 7d34dae..dfaa9925 100644 --- a/net/websockets/websocket_channel.h +++ b/net/websockets/websocket_channel.h @@ -12,10 +12,10 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "googleurl/src/gurl.h" #include "net/base/net_export.h" #include "net/websockets/websocket_frame.h" #include "net/websockets/websocket_stream.h" +#include "url/gurl.h" namespace net { diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index 25e20ef..4c68d6d 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc @@ -15,7 +15,6 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_piece.h" -#include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_context.h" #include "net/websockets/websocket_errors.h" @@ -23,6 +22,7 @@ #include "net/websockets/websocket_mux.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" namespace net { |