Update SplitString calls in components

components/translate/core/browser/translate_prefs.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 "components/translate/core/browser/translate_prefs.h"
 
 #include <set>
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 61 matching lines @@
   std::set<std::string> seen;
 
   for (std::vector<std::string>::const_iterator it = languages.begin();
        it != languages.end(); ++it) {
     const std::string& language = *it;
     if (seen.find(language) == seen.end()) {
       expanded_languages->push_back(language);
       seen.insert(language);
     }
 
-    std::vector<std::string> tokens;
-    base::SplitString(language, '-', &tokens);
+    std::vector<std::string> tokens = base::SplitString(
+        language, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     if (tokens.size() == 0)
       continue;
     const std::string& main_part = tokens[0];
     if (seen.find(main_part) == seen.end()) {
       expanded_languages->push_back(main_part);
       seen.insert(main_part);
     }
   }
 }
 
@@ skipping 218 matching lines @@
 void TranslatePrefs::GetLanguageList(std::vector<std::string>* languages) {
   DCHECK(languages);
   DCHECK(languages->empty());
 
 #if defined(OS_CHROMEOS)
   const char* key = preferred_languages_pref_.c_str();
 #else
   const char* key = accept_languages_pref_.c_str();
 #endif
 
-  std::string languages_str = prefs_->GetString(key);
-  base::SplitString(languages_str, ',', languages);
+  *languages = base::SplitString(prefs_->GetString(key), ",",
+                                 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 }
 
 void TranslatePrefs::UpdateLanguageList(
     const std::vector<std::string>& languages) {
 #if defined(OS_CHROMEOS)
   std::string languages_str = base::JoinString(languages, ",");
   prefs_->SetString(preferred_languages_pref_.c_str(), languages_str);
 #endif
 
   // Save the same language list as accept languages preference as well, but we
@@ skipping 108 matching lines @@
   // should be translated instead of the blacklist. The blacklist is no longer
   // used after launching the settings UI.
   // After that, Set 'translate_languages_not_translate' to Accept languages to
   // enable settings for users.
   bool merged = user_prefs->HasPrefPath(kPrefTranslateBlockedLanguages);
 
   if (!merged) {
     std::vector<std::string> blacklisted_languages;
     GetBlacklistedLanguages(user_prefs, &blacklisted_languages);
 
-    std::string accept_languages_str =
-        user_prefs->GetString(accept_languages_pref);
-    std::vector<std::string> accept_languages;
-    base::SplitString(accept_languages_str, ',', &accept_languages);
+    std::vector<std::string> accept_languages = base::SplitString(
+        user_prefs->GetString(accept_languages_pref), ",",
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     std::vector<std::string> blocked_languages;
     CreateBlockedLanguages(
         &blocked_languages, blacklisted_languages, accept_languages);
 
     // Create the new preference kPrefTranslateBlockedLanguages.
     {
       base::ListValue blocked_languages_list;
       for (std::vector<std::string>::const_iterator it =
                blocked_languages.begin();
@@ skipping 110 matching lines @@
   const base::ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist == NULL || blacklist->empty());
 }
 
 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
   const base::DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }
 
 }  // namespace translate