diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 00:21:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 00:21:39 +0000 |
| commit | f4ebe772e28369908c70e2e79f052d043c6f8eeb (patch) | |
| tree | 8abbccc21509118c1228bc116a6f0f250759a801 /chrome_frame | |
| parent | 11e45efce9cc17e1b2b76e6a636cc63b2c021324 (diff) | |
| download | chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.zip chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.gz chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.bz2 | |
Move string tokenizer to base/strings.
BUG=
Review URL: https://codereview.chromium.org/12087091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/html_utils.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/test/test_server.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/utils.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc index 3192f14..ef49b06 100644 --- a/chrome_frame/html_utils.cc +++ b/chrome_frame/html_utils.cc @@ -8,8 +8,8 @@ #include <urlmon.h> #include "base/string_util.h" -#include "base/string_tokenizer.h" #include "base/stringprintf.h" +#include "base/strings/string_tokenizer.h" #include "chrome/common/chrome_version_info.h" #include "chrome_frame/utils.h" #include "net/base/net_util.h" @@ -82,8 +82,8 @@ bool HTMLScanner::StringRange::GetTagAttribute(const wchar_t* attribute_name, // from string_util.h. std::string search_name_ascii(WideToASCII(attribute_name)); - WStringTokenizer tokenizer(start_, end_, L" =/"); - tokenizer.set_options(WStringTokenizer::RETURN_DELIMS); + base::WStringTokenizer tokenizer(start_, end_, L" =/"); + tokenizer.set_options(base::WStringTokenizer::RETURN_DELIMS); // Set up the quote chars so that we get quoted attribute values as single // tokens. diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 83946c6..e580476 100644 --- a/chrome_frame/test/test_server.cc +++ b/chrome_frame/test/test_server.cc @@ -37,7 +37,7 @@ void Request::ParseHeaders(const std::string& headers) { if (pos != std::string::npos) { headers_ = headers.substr(pos + 2); - StringTokenizer tokenizer(headers.begin(), headers.begin() + pos, " "); + base::StringTokenizer tokenizer(headers.begin(), headers.begin() + pos, " "); std::string* parse[] = { &method_, &path_, &version_ }; int field = 0; while (tokenizer.GetNext() && field < arraysize(parse)) { diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index a4814fea..7a9dc39 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -17,9 +17,9 @@ #include "base/path_service.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" -#include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_tokenizer.h" #include "base/threading/thread_local.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" @@ -1401,7 +1401,7 @@ bool ChromeFrameUrl::ParseAttachExternalTabUrl() { } attach_to_external_tab_ = true; - StringTokenizer tokenizer(query, "&"); + base::StringTokenizer tokenizer(query, "&"); // Skip over kChromeAttachExternalTabPrefix tokenizer.GetNext(); // Read the following items in order. |