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 /net/cookies | |
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 'net/cookies')
-rw-r--r-- | net/cookies/cookie_monster_unittest.cc | 2 | ||||
-rw-r--r-- | net/cookies/cookie_store_unittest.h | 4 | ||||
-rw-r--r-- | net/cookies/cookie_util.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index d02b511..439f4c8 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -14,7 +14,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_samples.h" #include "base/stringprintf.h" -#include "base/string_tokenizer.h" +#include "base/strings/string_tokenizer.h" #include "base/threading/thread.h" #include "base/time.h" #include "googleurl/src/gurl.h" diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h index 51c389d..0b742b3 100644 --- a/net/cookies/cookie_store_unittest.h +++ b/net/cookies/cookie_store_unittest.h @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_tokenizer.h" +#include "base/strings/string_tokenizer.h" #include "base/threading/thread.h" #include "googleurl/src/gurl.h" #include "net/cookies/cookie_monster.h" @@ -252,7 +252,7 @@ class CookieStoreTest : public testing::Test { // Returns a set of strings of type "name=value". Fails in case of duplicate. std::set<std::string> TokenizeCookieLine(const std::string& line) { std::set<std::string> tokens; - StringTokenizer tokenizer(line, " ;"); + base::StringTokenizer tokenizer(line, " ;"); while (tokenizer.GetNext()) EXPECT_TRUE(tokens.insert(tokenizer.token()).second); return tokens; diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc index 6cd3b29..efea441 100644 --- a/net/cookies/cookie_util.cc +++ b/net/cookies/cookie_util.cc @@ -8,8 +8,8 @@ #include <cstdlib> #include "base/logging.h" -#include "base/string_tokenizer.h" #include "base/string_util.h" +#include "base/strings/string_tokenizer.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" @@ -103,7 +103,7 @@ base::Time ParseCookieTime(const std::string& time_string) { base::Time::Exploded exploded = {0}; - StringTokenizer tokenizer(time_string, kDelimiters); + base::StringTokenizer tokenizer(time_string, kDelimiters); bool found_day_of_month = false; bool found_month = false; |