Update SplitString calls in components

components/search_engines/default_search_manager_unittest.cc

 // Copyright 2014 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 "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 111 matching lines @@
   scoped_ptr<TemplateURLData> data(new TemplateURLData());
   data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name")));
   data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key")));
   data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}"));
   data->suggestions_url = std::string("http://").append(type).append("sugg");
   data->alternate_urls.push_back(
       std::string("http://").append(type).append("foo/alt"));
   data->favicon_url = GURL("http://icon1");
   data->safe_for_autoreplace = true;
   data->show_in_default_list = true;
-  base::SplitString("UTF-8;UTF-16", ';', &data->input_encodings);
+  data->input_encodings = base::SplitString(
+      "UTF-8;UTF-16", ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   data->date_created = base::Time();
   data->last_modified = base::Time();
   return data.Pass();
 }
 
 }  // namespace
 
 class DefaultSearchManagerTest : public testing::Test {
  public:
   DefaultSearchManagerTest() {};
@@ skipping 20 matching lines @@
                                DefaultSearchManager::ObserverCallback());
   TemplateURLData data;
   data.SetShortName(base::UTF8ToUTF16("name1"));
   data.SetKeyword(base::UTF8ToUTF16("key1"));
   data.SetURL("http://foo1/{searchTerms}");
   data.suggestions_url = "http://sugg1";
   data.alternate_urls.push_back("http://foo1/alt");
   data.favicon_url = GURL("http://icon1");
   data.safe_for_autoreplace = true;
   data.show_in_default_list = true;
-  base::SplitString("UTF-8;UTF-16", ';', &data.input_encodings);
+  data.input_encodings = base::SplitString(
+      "UTF-8;UTF-16", ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   data.date_created = base::Time();
   data.last_modified = base::Time();
 
   manager.SetUserSelectedDefaultSearchEngine(data);
   TemplateURLData* read_data = manager.GetDefaultSearchEngine(NULL);
   ExpectSimilar(&data, read_data);
 }
 
 // Test DefaultSearchmanager handles user-selected DSEs correctly.
 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByUserPref) {
@@ skipping 131 matching lines @@
 
   ExpectSimilar(extension_data_3.get(),
                 manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
 
   manager.ClearExtensionControlledDefaultSearchEngine();
 
   ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
 }