diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:35:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 00:35:36 +0000 |
| commit | 76eb0247d08fa6c503517ec1a0cb8e6566cd39c7 (patch) | |
| tree | e14c2632fab2f76df22827fe0c7908fd54240699 /chrome/browser/search_engines | |
| parent | 7f8aff5b10859950cf9a6996a5d3d288ea3c75f4 (diff) | |
| download | chromium_src-76eb0247d08fa6c503517ec1a0cb8e6566cd39c7.zip chromium_src-76eb0247d08fa6c503517ec1a0cb8e6566cd39c7.tar.gz chromium_src-76eb0247d08fa6c503517ec1a0cb8e6566cd39c7.tar.bz2 | |
base: Move SplitString functions into the base namespace and update the callers.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3750001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/search_engines/template_url_model_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index aa543fb..57976f7 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -835,7 +835,7 @@ bool TemplateURLModel::LoadDefaultSearchProviderFromPrefs( (*default_provider)->set_keyword(keyword); (*default_provider)->SetFavIconURL(GURL(icon_url)); std::vector<std::string> encodings_vector; - SplitString(encodings, ';', &encodings_vector); + base::SplitString(encodings, ';', &encodings_vector); (*default_provider)->set_input_encodings(encodings_vector); if (!id_string.empty()) { int64 value; diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc index 3027465..498d884 100644 --- a/chrome/browser/search_engines/template_url_model_unittest.cc +++ b/chrome/browser/search_engines/template_url_model_unittest.cc @@ -133,7 +133,7 @@ class TemplateURLModelTest : public testing::Test { template_url->set_autogenerate_keyword(autogenerate_keyword); template_url->set_short_name(short_name); std::vector<std::string> encodings_vector; - SplitString(encodings, ';', &encodings_vector); + base::SplitString(encodings, ';', &encodings_vector); template_url->set_input_encodings(encodings_vector); template_url->set_date_created(created_date); template_url->set_safe_for_autoreplace(safe_for_autoreplace); @@ -774,8 +774,8 @@ TEST_F(TemplateURLModelTest, BuildQueryTerms) { if (data[i].result) { std::vector<std::string> keys; std::vector<std::string> values; - SplitString(data[i].keys, ';', &keys); - SplitString(data[i].values, ';', &values); + base::SplitString(data[i].keys, ';', &keys); + base::SplitString(data[i].values, ';', &values); ASSERT_TRUE(keys.size() == values.size()); ASSERT_EQ(keys.size(), terms.size()); for (size_t j = 0; j < keys.size(); ++j) { @@ -1129,7 +1129,7 @@ TEST_F(TemplateURLModelTest, TestManagedDefaultSearch) { expected_managed_default1->SetFavIconURL(GURL(kIconURL)); expected_managed_default1->set_short_name(L"test1"); std::vector<std::string> encodings_vector; - SplitString(kEncodings, ';', &encodings_vector); + base::SplitString(kEncodings, ';', &encodings_vector); expected_managed_default1->set_input_encodings(encodings_vector); expected_managed_default1->set_show_in_default_list(true); const TemplateURL* actual_managed_default = |