diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 13:36:22 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 13:36:22 +0000 |
| commit | 7594f6d81259f9a299e50c4174af080bb5e0b288 (patch) | |
| tree | 8f4a3e06e80b59421f7a566effc8a5fb1f95960e /net | |
| parent | 769c462e0ffbbbc2f210a76874d041dbcff921fc (diff) | |
| download | chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.zip chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.gz chromium_src-7594f6d81259f9a299e50c4174af080bb5e0b288.tar.bz2 | |
base: Move SplitStringDontTrim functions from string_util.h to string_split.h
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3366011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/websockets/websocket_handshake_unittest.cc | 3 | ||||
| -rw-r--r-- | net/websockets/websocket_net_log_params.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/websockets/websocket_handshake_unittest.cc b/net/websockets/websocket_handshake_unittest.cc index f688554..e392cfc 100644 --- a/net/websockets/websocket_handshake_unittest.cc +++ b/net/websockets/websocket_handshake_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "net/websockets/websocket_handshake.h" #include "testing/gtest/include/gtest/gtest.h" @@ -140,7 +141,7 @@ TEST_F(WebSocketHandshakeTest, Connect) { "\r\n" "\x30\x73\x74\x33\x52\x6C\x26\x71\x2D\x32\x5A\x55\x5E\x77\x65\x75"; std::vector<std::string> response_lines; - SplitStringDontTrim(kResponse, '\n', &response_lines); + base::SplitStringDontTrim(kResponse, '\n', &response_lines); EXPECT_EQ(WebSocketHandshake::MODE_INCOMPLETE, handshake->mode()); // too short diff --git a/net/websockets/websocket_net_log_params.h b/net/websockets/websocket_net_log_params.h index 780cb3b..b11cefd 100644 --- a/net/websockets/websocket_net_log_params.h +++ b/net/websockets/websocket_net_log_params.h @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/ref_counted.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/values.h" #include "net/base/net_log.h" @@ -27,7 +28,7 @@ class NetLogWebSocketHandshakeParameter : public NetLog::EventParameters { DictionaryValue* dict = new DictionaryValue(); ListValue* headers = new ListValue(); std::vector<std::string> lines; - SplitStringDontTrim(headers_, '\n', &lines); + base::SplitStringDontTrim(headers_, '\n', &lines); for (size_t i = 0; i < lines.size(); ++i) { if (lines[i] == "\r") { headers->Append(new StringValue("")); |