diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 04:52:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 04:52:11 +0000 |
| commit | 4e5ae20ff403cdcd14d3b86b18a0d0bcec2f47cc (patch) | |
| tree | e224d7b5d871995421ac845db1c9406393b66f67 | |
| parent | 915a3abe017a65e6f3bcc76d2968df476efc4a6e (diff) | |
| download | chromium_src-4e5ae20ff403cdcd14d3b86b18a0d0bcec2f47cc.zip chromium_src-4e5ae20ff403cdcd14d3b86b18a0d0bcec2f47cc.tar.gz chromium_src-4e5ae20ff403cdcd14d3b86b18a0d0bcec2f47cc.tar.bz2 | |
base: Finish moving the SplitString functions from string_util.h to string_split.h
BUG=None
TEST=trybos
Review URL: http://codereview.chromium.org/3447008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60422 0039d316-1c4b-4281-b951-d872f2087c98
86 files changed, 250 insertions, 179 deletions
diff --git a/app/l10n_util.cc b/app/l10n_util.cc index 7e1c75a..c6530a0 100644 --- a/app/l10n_util.cc +++ b/app/l10n_util.cc @@ -17,6 +17,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/app/text_elider.cc b/app/text_elider.cc index f1ca16e..5a4d9d0 100644 --- a/app/text_elider.cc +++ b/app/text_elider.cc @@ -7,6 +7,7 @@ #include "app/text_elider.h" #include "base/file_path.h" #include "base/i18n/rtl.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/base/command_line.cc b/base/command_line.cc index d34bcb9..a68c8f3 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -21,6 +21,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/singleton.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 8b8a0c7..43e1a5c 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -18,6 +18,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/sys_info.h" diff --git a/base/string_split.cc b/base/string_split.cc index 646b4de..ca97954 100644 --- a/base/string_split.cc +++ b/base/string_split.cc @@ -9,6 +9,52 @@ #include "base/third_party/icu/icu_utf.h" #include "base/utf_string_conversions.h" +template<typename STR> +static void SplitStringT(const STR& str, + const typename STR::value_type s, + bool trim_whitespace, + std::vector<STR>* r) { + size_t last = 0; + size_t i; + size_t c = str.size(); + for (i = 0; i <= c; ++i) { + if (i == c || str[i] == s) { + size_t len = i - last; + STR tmp = str.substr(last, len); + if (trim_whitespace) { + STR t_tmp; + TrimWhitespace(tmp, TRIM_ALL, &t_tmp); + r->push_back(t_tmp); + } else { + r->push_back(tmp); + } + last = i + 1; + } + } +} + +void SplitString(const std::wstring& str, + wchar_t c, + std::vector<std::wstring>* r) { + SplitStringT(str, c, true, r); +} + +#if !defined(WCHAR_T_IS_UTF16) +void SplitString(const string16& str, + char16 c, + std::vector<string16>* r) { + DCHECK(CBU16_IS_SINGLE(c)); + SplitStringT(str, c, true, r); +} +#endif + +void SplitString(const std::string& str, + char c, + std::vector<std::string>* r) { + DCHECK(c >= 0 && c < 0x7F); + SplitStringT(str, c, true, r); +} + namespace base { bool SplitStringIntoKeyValues( @@ -107,30 +153,6 @@ void SplitStringUsingSubstr(const std::string& str, SplitStringUsingSubstrT(str, s, r); } -template<typename STR> -static void SplitStringT(const STR& str, - const typename STR::value_type s, - bool trim_whitespace, - std::vector<STR>* r) { - size_t last = 0; - size_t i; - size_t c = str.size(); - for (i = 0; i <= c; ++i) { - if (i == c || str[i] == s) { - size_t len = i - last; - STR tmp = str.substr(last, len); - if (trim_whitespace) { - STR t_tmp; - TrimWhitespace(tmp, TRIM_ALL, &t_tmp); - r->push_back(t_tmp); - } else { - r->push_back(tmp); - } - last = i + 1; - } - } -} - void SplitStringDontTrim(const std::wstring& str, wchar_t c, std::vector<std::wstring>* r) { @@ -150,7 +172,7 @@ void SplitStringDontTrim(const std::string& str, char c, std::vector<std::string>* r) { DCHECK(IsStringUTF8(str)); - DCHECK(c < 0x7F); + DCHECK(c >= 0 && c < 0x7F); SplitStringT(str, c, false, r); } diff --git a/base/string_split.h b/base/string_split.h index d47337c..c7cb5e7 100644 --- a/base/string_split.h +++ b/base/string_split.h @@ -12,6 +12,33 @@ #include "base/string16.h" +// TODO(tfarina): Move the following functions into the namespace and update the +// callers. +//----------------------------------------------------------------------------- + +// Splits |str| into a vector of strings delimited by |s|. Append the results +// into |r| as they appear. If several instances of |s| are contiguous, or if +// |str| begins with or ends with |s|, then an empty string is inserted. +// +// Every substring is trimmed of any leading or trailing white space. +// Where wchar_t is char16 (i.e. Windows), |c| must be in BMP +// (Basic Multilingual Plane). Elsewhere (Linux/Mac), wchar_t +// should be a valid Unicode code point (32-bit). +void SplitString(const std::wstring& str, + wchar_t c, + std::vector<std::wstring>* r); +// NOTE: |c| must be in BMP (Basic Multilingual Plane) +void SplitString(const string16& str, + char16 c, + std::vector<string16>* r); +// |str| should not be in a multi-byte encoding like Shift-JIS or GBK in which +// the trailing byte of a multi-byte character can be in the ASCII range. +// UTF-8, and other single/multi-byte ASCII-compatible encodings are OK. +// Note: |c| must be in the ASCII range. +void SplitString(const std::string& str, + char c, + std::vector<std::string>* r); + namespace base { bool SplitStringIntoKeyValues( diff --git a/base/string_split_unittest.cc b/base/string_split_unittest.cc index f3a929d..d4042ad 100644 --- a/base/string_split_unittest.cc +++ b/base/string_split_unittest.cc @@ -139,6 +139,73 @@ TEST(SplitStringUsingSubstrTest, EmptyString) { EXPECT_THAT(results, ElementsAre("")); } +// Test for SplitString +TEST(StringUtilTest, SplitString) { + std::vector<std::wstring> r; + + SplitString(L"", L',', &r); + ASSERT_EQ(1U, r.size()); + EXPECT_EQ(r[0], L""); + r.clear(); + + SplitString(L"a,b,c", L',', &r); + ASSERT_EQ(3U, r.size()); + EXPECT_EQ(r[0], L"a"); + EXPECT_EQ(r[1], L"b"); + EXPECT_EQ(r[2], L"c"); + r.clear(); + + SplitString(L"a, b, c", L',', &r); + ASSERT_EQ(3U, r.size()); + EXPECT_EQ(r[0], L"a"); + EXPECT_EQ(r[1], L"b"); + EXPECT_EQ(r[2], L"c"); + r.clear(); + + SplitString(L"a,,c", L',', &r); + ASSERT_EQ(3U, r.size()); + EXPECT_EQ(r[0], L"a"); + EXPECT_EQ(r[1], L""); + EXPECT_EQ(r[2], L"c"); + r.clear(); + + SplitString(L"", L'*', &r); + ASSERT_EQ(1U, r.size()); + EXPECT_EQ(r[0], L""); + r.clear(); + + SplitString(L"foo", L'*', &r); + ASSERT_EQ(1U, r.size()); + EXPECT_EQ(r[0], L"foo"); + r.clear(); + + SplitString(L"foo ,", L',', &r); + ASSERT_EQ(2U, r.size()); + EXPECT_EQ(r[0], L"foo"); + EXPECT_EQ(r[1], L""); + r.clear(); + + SplitString(L",", L',', &r); + ASSERT_EQ(2U, r.size()); + EXPECT_EQ(r[0], L""); + EXPECT_EQ(r[1], L""); + r.clear(); + + SplitString(L"\t\ta\t", L'\t', &r); + ASSERT_EQ(4U, r.size()); + EXPECT_EQ(r[0], L""); + EXPECT_EQ(r[1], L""); + EXPECT_EQ(r[2], L"a"); + EXPECT_EQ(r[3], L""); + r.clear(); + + SplitString(L"\ta\t\nb\tcc", L'\n', &r); + ASSERT_EQ(2U, r.size()); + EXPECT_EQ(r[0], L"a"); + EXPECT_EQ(r[1], L"b\tcc"); + r.clear(); +} + TEST(SplitStringUsingSubstrTest, StringWithNoDelimiter) { std::vector<std::string> results; SplitStringUsingSubstr("alongwordwithnodelimiter", "DELIMITER", &results); diff --git a/base/string_util.cc b/base/string_util.cc index ba9108b..c30db96 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -757,51 +757,6 @@ void ReplaceSubstringsAfterOffset(std::string* str, true); // replace all instances } -// TODO(tfarina): Remove this when finish moving SplitString functions to -// string_split.[cc/h]. -template<typename STR> -static void SplitStringT(const STR& str, - const typename STR::value_type s, - bool trim_whitespace, - std::vector<STR>* r) { - size_t last = 0; - size_t i; - size_t c = str.size(); - for (i = 0; i <= c; ++i) { - if (i == c || str[i] == s) { - size_t len = i - last; - STR tmp = str.substr(last, len); - if (trim_whitespace) { - STR t_tmp; - TrimWhitespace(tmp, TRIM_ALL, &t_tmp); - r->push_back(t_tmp); - } else { - r->push_back(tmp); - } - last = i + 1; - } - } -} - -void SplitString(const std::wstring& str, - wchar_t s, - std::vector<std::wstring>* r) { - SplitStringT(str, s, true, r); -} - -#if !defined(WCHAR_T_IS_UTF16) -void SplitString(const string16& str, - char16 s, - std::vector<string16>* r) { - SplitStringT(str, s, true, r); -} -#endif - -void SplitString(const std::string& str, - char s, - std::vector<std::string>* r) { - SplitStringT(str, s, true, r); -} template<typename STR> static size_t TokenizeT(const STR& str, diff --git a/base/string_util.h b/base/string_util.h index b1cb828..1b279a0 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -23,6 +23,12 @@ // and then remove this. #include "base/stringprintf.h" +#ifdef RLZ_WIN_LIB_RLZ_LIB_H_ +// TODO(tfarina): Fix the rlz library to include this instead and remove +// this include. +#include "base/string_split.h" +#endif // RLZ_WIN_LIB_RLZ_LIB_H_ + // Safe standard library wrappers for all platforms. namespace base { @@ -504,25 +510,6 @@ template<typename Char> struct CaseInsensitiveCompareASCII { } }; -// TODO(timsteele): Move these split string functions into their own API on -// string_split.cc/.h files. -//----------------------------------------------------------------------------- - -// Splits |str| into a vector of strings delimited by |s|. Append the results -// into |r| as they appear. If several instances of |s| are contiguous, or if -// |str| begins with or ends with |s|, then an empty string is inserted. -// -// Every substring is trimmed of any leading or trailing white space. -void SplitString(const std::wstring& str, - wchar_t s, - std::vector<std::wstring>* r); -void SplitString(const string16& str, - char16 s, - std::vector<string16>* r); -void SplitString(const std::string& str, - char s, - std::vector<std::string>* r); - // Splits a string into its fields delimited by any of the characters in // |delimiters|. Each field is added to the |tokens| vector. Returns the // number of tokens found. diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc index c4fd5ae..8163ba0 100644 --- a/base/string_util_unittest.cc +++ b/base/string_util_unittest.cc @@ -702,73 +702,6 @@ TEST(StringUtilTest, VAList) { VariableArgsFunc("%d %d %s %lf", 45, 92, "This is interesting", 9.21); } -// Test for SplitString -TEST(StringUtilTest, SplitString) { - std::vector<std::wstring> r; - - SplitString(L"", L',', &r); - ASSERT_EQ(1U, r.size()); - EXPECT_EQ(r[0], L""); - r.clear(); - - SplitString(L"a,b,c", L',', &r); - ASSERT_EQ(3U, r.size()); - EXPECT_EQ(r[0], L"a"); - EXPECT_EQ(r[1], L"b"); - EXPECT_EQ(r[2], L"c"); - r.clear(); - - SplitString(L"a, b, c", L',', &r); - ASSERT_EQ(3U, r.size()); - EXPECT_EQ(r[0], L"a"); - EXPECT_EQ(r[1], L"b"); - EXPECT_EQ(r[2], L"c"); - r.clear(); - - SplitString(L"a,,c", L',', &r); - ASSERT_EQ(3U, r.size()); - EXPECT_EQ(r[0], L"a"); - EXPECT_EQ(r[1], L""); - EXPECT_EQ(r[2], L"c"); - r.clear(); - - SplitString(L"", L'*', &r); - ASSERT_EQ(1U, r.size()); - EXPECT_EQ(r[0], L""); - r.clear(); - - SplitString(L"foo", L'*', &r); - ASSERT_EQ(1U, r.size()); - EXPECT_EQ(r[0], L"foo"); - r.clear(); - - SplitString(L"foo ,", L',', &r); - ASSERT_EQ(2U, r.size()); - EXPECT_EQ(r[0], L"foo"); - EXPECT_EQ(r[1], L""); - r.clear(); - - SplitString(L",", L',', &r); - ASSERT_EQ(2U, r.size()); - EXPECT_EQ(r[0], L""); - EXPECT_EQ(r[1], L""); - r.clear(); - - SplitString(L"\t\ta\t", L'\t', &r); - ASSERT_EQ(4U, r.size()); - EXPECT_EQ(r[0], L""); - EXPECT_EQ(r[1], L""); - EXPECT_EQ(r[2], L"a"); - EXPECT_EQ(r[3], L""); - r.clear(); - - SplitString(L"\ta\t\nb\tcc", L'\n', &r); - ASSERT_EQ(2U, r.size()); - EXPECT_EQ(r[0], L"a"); - EXPECT_EQ(r[1], L"b\tcc"); - r.clear(); -} - // Test for Tokenize template <typename STR> void TokenizeTest() { diff --git a/base/version.cc b/base/version.cc index c784082..8a09142 100644 --- a/base/version.cc +++ b/base/version.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index 4632cec..5f31438 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -18,6 +18,7 @@ #include "base/file_version_info.h" #include "base/registry.h" #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index a421ad9..94a2e16 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -7,6 +7,7 @@ #include "base/message_loop.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_index.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 2c83d32..8a4e726 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -24,6 +24,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 8594b41..3d981f1 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -16,6 +16,7 @@ #include "base/hash_tables.h" #include "base/scoped_ptr.h" #include "base/singleton.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/login/google_authenticator.cc b/chrome/browser/chromeos/login/google_authenticator.cc index eb3f119..d1b23d5 100644 --- a/chrome/browser/chromeos/login/google_authenticator.cc +++ b/chrome/browser/chromeos/login/google_authenticator.cc @@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/sha2.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/third_party/nss/blapi.h" #include "base/third_party/nss/sha256.h" diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc index 3e4ac6f..3502c2f 100644 --- a/chrome/browser/chromeos/options/language_config_model.cc +++ b/chrome/browser/chromeos/options/language_config_model.cc @@ -9,6 +9,7 @@ #include <utility> #include "app/l10n_util.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/input_method_library.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 07d9305..6881ae9 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/chromeos/preferences.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc index d7dcb14..0c42b16 100644 --- a/chrome/browser/chromeos/status/language_menu_button.cc +++ b/chrome/browser/chromeos/status/language_menu_button.cc @@ -8,6 +8,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 9475205..e24b357 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,6 +9,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/dom_ui/cookies_view_handler.cc b/chrome/browser/dom_ui/cookies_view_handler.cc index 0357d63..4f62393 100644 --- a/chrome/browser/dom_ui/cookies_view_handler.cc +++ b/chrome/browser/dom_ui/cookies_view_handler.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index d94c29c..53c008e 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" #include "base/callback.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index f28b82f..9639779 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -5,6 +5,7 @@ #include "chrome/browser/download/download_prefs.h" #include "base/file_util.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index 9953a4c..9fccd6e 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -12,6 +12,7 @@ #include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/string_piece.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "base/task.h" #include "base/thread.h" diff --git a/chrome/browser/extensions/extension_devtools_events.cc b/chrome/browser/extensions/extension_devtools_events.cc index 2ccb9e5..f29d459 100644 --- a/chrome/browser/extensions/extension_devtools_events.cc +++ b/chrome/browser/extensions/extension_devtools_events.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index b51cc5e..593b04d 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -14,6 +14,7 @@ #include "base/sha2.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "base/thread.h" diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 3073304a..b40eb6e 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -8,6 +8,7 @@ #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/thread.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 589dc32..38b76a3 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -22,6 +22,7 @@ #include "base/scoped_comptr_win.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/browser/extensions/extensions_service.h" diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index cb96e16..6e3e93c 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "unicode/brkiter.h" diff --git a/chrome/browser/history/snippet_unittest.cc b/chrome/browser/history/snippet_unittest.cc index eaf9f5f..75f627a 100644 --- a/chrome/browser/history/snippet_unittest.cc +++ b/chrome/browser/history/snippet_unittest.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index dee56ba..d7932b8 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -13,6 +13,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stl_util-inl.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc index ed5b7c9..6ff1798 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 59aad60..cbea511 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -21,6 +21,7 @@ #include "base/file_util.h" #include "base/registry.h" #include "base/scoped_comptr_win.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "base/values.h" diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index 91149e2..98522c6 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -17,6 +17,7 @@ #endif // defined(USE_NSS) #include "base/base64.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 05bd16d6..ad9ad61 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -7,6 +7,7 @@ #include <limits> #include "base/rand_util.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index f361b77..42a8a17 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -8,6 +8,7 @@ #include "base/leak_tracker.h" #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" diff --git a/chrome/browser/language_combobox_model.cc b/chrome/browser/language_combobox_model.cc index 0a87497..747862c 100644 --- a/chrome/browser/language_combobox_model.cc +++ b/chrome/browser/language_combobox_model.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" #include "base/i18n/rtl.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/language_order_table_model.cc b/chrome/browser/language_order_table_model.cc index eadebe9..0598912 100644 --- a/chrome/browser/language_order_table_model.cc +++ b/chrome/browser/language_order_table_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "app/l10n_util.h" #include "app/table_model_observer.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc index 3635848..81ba774 100644 --- a/chrome/browser/password_manager/password_form_manager.cc +++ b/chrome/browser/password_manager/password_form_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include <algorithm> #include "base/histogram.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index d064987..da80b2b 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -69,6 +69,7 @@ #include "base/safe_strerror_posix.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "base/time.h" diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index c42fab3..1cb52d6 100644 --- a/chrome/browser/safe_browsing/chunk_range.cc +++ b/chrome/browser/safe_browsing/chunk_range.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" ChunkRange::ChunkRange(int start) : start_(start), stop_(start) { diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc index 4590e56..c022da4 100644 --- a/chrome/browser/safe_browsing/protocol_parser.cc +++ b/chrome/browser/safe_browsing/protocol_parser.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -16,6 +16,7 @@ #include "base/format_macros.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" namespace { diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc index 6831c20..c97fb74 100644 --- a/chrome/browser/search_engines/template_url_model_unittest.cc +++ b/chrome/browser/search_engines/template_url_model_unittest.cc @@ -4,6 +4,7 @@ #include "base/callback.h" #include "base/scoped_vector.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/ref_counted.h" #include "base/thread.h" diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc index 5413ce5..ceead6b 100644 --- a/chrome/browser/spellcheck_host.cc +++ b/chrome/browser/spellcheck_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 1ea9fad..6f649fd 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/histogram.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index e09fa73..71e29187 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -16,6 +16,7 @@ #include "base/message_loop.h" #include "base/registry.h" #include "base/scoped_comptr_win.h" +#include "base/string_split.h" #include "base/thread.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index eaeb623..dccf6d7 100644 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -13,6 +13,7 @@ #include "app/sql/statement.h" #include "app/sql/transaction.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/tuple.h" #include "base/utf_string_conversions.h" diff --git a/chrome/common/extensions/url_pattern.cc b/chrome/common/extensions/url_pattern.cc index 988988a..80fc5fb 100644 --- a/chrome/common/extensions/url_pattern.cc +++ b/chrome/common/extensions/url_pattern.cc @@ -5,6 +5,7 @@ #include "chrome/common/extensions/url_pattern.h" #include "base/string_piece.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" diff --git a/chrome/common/pepper_plugin_registry.cc b/chrome/common/pepper_plugin_registry.cc index 7ba71e2..cda5809 100644 --- a/chrome/common/pepper_plugin_registry.cc +++ b/chrome/common/pepper_plugin_registry.cc @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/native_library.h" #include "base/path_service.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc index f1d89b5..01de36f 100644 --- a/chrome/common/zip.cc +++ b/chrome/common/zip.cc @@ -6,6 +6,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/file_stream.h" diff --git a/chrome/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc index fcb62b5..d6e06e8 100644 --- a/chrome/default_plugin/plugin_database_handler.cc +++ b/chrome/default_plugin/plugin_database_handler.cc @@ -10,6 +10,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/installer/util/compat_checks.cc b/chrome/installer/util/compat_checks.cc index 3c13b21..901e1ba 100644 --- a/chrome/installer/util/compat_checks.cc +++ b/chrome/installer/util/compat_checks.cc @@ -6,6 +6,7 @@ #include "base/registry.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" namespace { diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 1655af7..8470a31 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -20,6 +20,7 @@ #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/installer/util/version.cc b/chrome/installer/util/version.cc index f2ce049..ab9e450 100644 --- a/chrome/installer/util/version.cc +++ b/chrome/installer/util/version.cc @@ -8,6 +8,7 @@ #include "base/format_macros.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/installer/util/version.h" diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc index 619850f..ed0fa79 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "base/format_macros.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 2dd4581..7bf368e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,6 +16,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/ref_counted.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index b75d8aa..4436867 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -14,6 +14,7 @@ #include "base/path_service.h" #include "base/rand_util.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" diff --git a/chrome/test/chrome_process_util_mac.cc b/chrome/test/chrome_process_util_mac.cc index 21e8746..c4f12fd 100644 --- a/chrome/test/chrome_process_util_mac.cc +++ b/chrome/test/chrome_process_util_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/process_util.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" MacChromeProcessInfoList GetRunningMacProcessInfo( diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc index 2364291..296d925 100644 --- a/chrome/test/selenium/selenium_test.cc +++ b/chrome/test/selenium/selenium_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,6 +15,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index ee8e502..743b820 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -7,6 +7,7 @@ #include "base/path_service.h" #include "base/platform_thread.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/test/test_file_util.h" diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc index 1b3c244..9ef0fda 100644 --- a/chrome/test/ui/dom_checker_uitest.cc +++ b/chrome/test/ui/dom_checker_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 7a3b9c5..3f76b94 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -24,6 +24,7 @@ #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/test/test_file_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/webdriver/dispatch.h b/chrome/test/webdriver/dispatch.h index f612602..8db3195 100644 --- a/chrome/test/webdriver/dispatch.h +++ b/chrome/test/webdriver/dispatch.h @@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "chrome/test/webdriver/utility_functions.h" #include "chrome/test/webdriver/commands/command.h" diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc index 0e6cfda..6e558f4 100644 --- a/chrome/tools/convert_dict/aff_reader.cc +++ b/chrome/tools/convert_dict/aff_reader.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "base/file_util.h" #include "base/i18n/icu_string_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/tools/convert_dict/hunspell_reader.h" diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 7690119..705be34 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -17,6 +17,7 @@ #include "base/process_util.h" #include "base/scoped_bstr_win.h" #include "base/singleton.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/trace_event.h" #include "base/utf_string_conversions.h" diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index 1ad2c30..4cd889be 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index 6cd4516..46b4f1c 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -53,6 +53,7 @@ #include "base/file_version_info.h" #include "base/lock.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/thread.h" #include "base/string_number_conversions.h" diff --git a/net/base/host_mapping_rules.cc b/net/base/host_mapping_rules.cc index e7d72b2..a1ec12d0 100644 --- a/net/base/host_mapping_rules.cc +++ b/net/base/host_mapping_rules.cc @@ -5,6 +5,7 @@ #include "net/base/host_mapping_rules.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "net/base/host_port_pair.h" diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 0a3f9b9..0935635 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -47,6 +47,7 @@ #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" +#include "base/string_split.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/net/ftp/ftp_directory_listing_parser_ls.cc b/net/ftp/ftp_directory_listing_parser_ls.cc index 143a236..38025a0 100644 --- a/net/ftp/ftp_directory_listing_parser_ls.cc +++ b/net/ftp/ftp_directory_listing_parser_ls.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_mlsd.cc b/net/ftp/ftp_directory_listing_parser_mlsd.cc index 656ae73..6d49634 100644 --- a/net/ftp/ftp_directory_listing_parser_mlsd.cc +++ b/net/ftp/ftp_directory_listing_parser_mlsd.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this +// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this // source code is governed by a BSD-style license that can be found in the // LICENSE file. @@ -9,6 +9,7 @@ #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/net/ftp/ftp_directory_listing_parser_netware.cc b/net/ftp/ftp_directory_listing_parser_netware.cc index 59a579c..40f6505 100644 --- a/net/ftp/ftp_directory_listing_parser_netware.cc +++ b/net/ftp/ftp_directory_listing_parser_netware.cc @@ -7,6 +7,7 @@ #include <vector> #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_vms.cc b/net/ftp/ftp_directory_listing_parser_vms.cc index bfdb952..7148aee 100644 --- a/net/ftp/ftp_directory_listing_parser_vms.cc +++ b/net/ftp/ftp_directory_listing_parser_vms.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #include "net/ftp/ftp_directory_listing_parser_vms.h" #include <vector> #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/ftp/ftp_util.h" diff --git a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc index 2d6404c..47cdaa5 100644 --- a/net/ftp/ftp_directory_listing_parser_vms_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_vms_unittest.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/ftp/ftp_directory_listing_parser_unittest.h" #include "base/format_macros.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/ftp/ftp_directory_listing_parser_vms.h" diff --git a/net/ftp/ftp_directory_listing_parser_windows.cc b/net/ftp/ftp_directory_listing_parser_windows.cc index 08131539..2ff3cd2 100644 --- a/net/ftp/ftp_directory_listing_parser_windows.cc +++ b/net/ftp/ftp_directory_listing_parser_windows.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #include "net/ftp/ftp_directory_listing_parser_windows.h" #include <vector> #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "net/ftp/ftp_util.h" diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index afb2606..65d2aa3 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -6,6 +6,7 @@ #include "base/field_trial.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" #include "net/http/http_network_session.h" #include "net/http/http_network_transaction.h" diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index e41003c..03237ab 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -6,6 +6,7 @@ #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "net/base/net_log.h" #include "net/base/net_util.h" diff --git a/net/tools/hresolv/hresolv.cc b/net/tools/hresolv/hresolv.cc index c11dd6e..ae0ee0f 100644 --- a/net/tools/hresolv/hresolv.cc +++ b/net/tools/hresolv/hresolv.cc @@ -29,6 +29,7 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/thread.h" #include "base/time.h" diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 736be61..9fde6c9 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "base/ref_counted.h" +#include "base/string_split.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_policy.h" diff --git a/views/controls/label.cc b/views/controls/label.cc index c4f8b22..8325cfa 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -11,6 +11,7 @@ #include "app/text_elider.h" #include "base/i18n/rtl.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" diff --git a/webkit/glue/plugins/plugin_lib_mac.mm b/webkit/glue/plugins/plugin_lib_mac.mm index 263b3b4..07da77c 100644 --- a/webkit/glue/plugins/plugin_lib_mac.mm +++ b/webkit/glue/plugins/plugin_lib_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,6 +9,7 @@ #include "base/native_library.h" #include "base/scoped_cftyperef.h" #include "base/scoped_ptr.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/webkit/glue/plugins/plugin_lib_posix.cc b/webkit/glue/plugins/plugin_lib_posix.cc index dfeed55..fb813b6 100644 --- a/webkit/glue/plugins/plugin_lib_posix.cc +++ b/webkit/glue/plugins/plugin_lib_posix.cc @@ -17,6 +17,7 @@ #include "base/eintr_wrapper.h" #include "base/file_util.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index eeccdee..7666b15 100644 --- a/webkit/glue/plugins/plugin_list.cc +++ b/webkit/glue/plugins/plugin_list.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/time.h" diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc index 95b49c3..b23909b 100644 --- a/webkit/glue/plugins/plugin_list_posix.cc +++ b/webkit/glue/plugins/plugin_list_posix.cc @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/sha1.h" +#include "base/string_split.h" #include "base/string_util.h" #include "build/build_config.h" diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc index 28a6582..b5ded9e 100644 --- a/webkit/glue/plugins/plugin_list_win.cc +++ b/webkit/glue/plugins/plugin_list_win.cc @@ -15,6 +15,7 @@ #include "base/registry.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_lib.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index 782f873..3289a29 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -16,6 +16,7 @@ #include "base/scoped_ptr.h" #include "base/stats_counters.h" #include "base/string_number_conversions.h" +#include "base/string_split.h" #include "base/string_util.h" #include "base/win_util.h" #include "skia/ext/platform_canvas.h" |