Move language detection to a component

chrome/browser/translate/translate_prefs.cc

 // Copyright (c) 2011 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/translate/translate_prefs.h"
 
 #include <set>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_accept_languages.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/translate/translate_util.h"
+#include "components/translate/common/translate_util.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] =
     "translate_language_blacklist";
 const char TranslatePrefs::kPrefTranslateSiteBlacklist[] =
     "translate_site_blacklist";
 const char TranslatePrefs::kPrefTranslateWhitelists[] =
     "translate_whitelists";
 const char TranslatePrefs::kPrefTranslateDeniedCount[] =
     "translate_denied_count";
@@ skipping 27 matching lines @@
   base::SplitString(lang, '-', &tokens);
   if (tokens.size() < 1)
     return lang;
 
   std::string main_part = tokens[0];
 
   // Translate doesn't support General Chinese and the sub code is necessary.
   if (main_part == "zh")
     return lang;
 
-  TranslateUtil::ToTranslateLanguageSynonym(&main_part);
+  translate::ToTranslateLanguageSynonym(&main_part);
   return main_part;
 }
 
 // Expands language codes to make these more suitable for Accept-Language.
 // Example: ['en-US', 'ja', 'en-CA'] => ['en-US', 'en', 'ja', 'en-CA'].
 // 'en' won't appear twice as this function eliminates duplicates.
 void ExpandLanguageCodes(const std::vector<std::string>& languages,
                          std::vector<std::string>* expanded_languages) {
   DCHECK(expanded_languages);
   DCHECK(expanded_languages->empty());
@@ skipping 32 matching lines @@
   return IsValueBlacklisted(kPrefTranslateBlockedLanguages,
                             original_language);
 }
 
 void TranslatePrefs::BlockLanguage(
     const std::string& original_language) {
   BlacklistValue(kPrefTranslateBlockedLanguages, original_language);
 
   // Add the language to the language list at chrome://settings/languages.
   std::string language = original_language;
-  TranslateUtil::ToChromeLanguageSynonym(&language);
+  translate::ToChromeLanguageSynonym(&language);
 
   std::vector<std::string> languages;
   GetLanguageList(&languages);
 
   if (std::find(languages.begin(), languages.end(), language) ==
       languages.end()) {
     languages.push_back(language);
     UpdateLanguageList(languages);
   }
 }
@@ skipping 284 matching lines @@
       ListValue* list = update.Get();
       DCHECK(list != NULL);
       list->Swap(&blocked_languages_list);
     }
 
     // Update kAcceptLanguages
     for (std::vector<std::string>::const_iterator it =
              blocked_languages.begin();
          it != blocked_languages.end(); ++it) {
       std::string lang = *it;
-      TranslateUtil::ToChromeLanguageSynonym(&lang);
+      translate::ToChromeLanguageSynonym(&lang);
       bool not_found =
           std::find(accept_languages.begin(), accept_languages.end(), lang) ==
           accept_languages.end();
       if (not_found)
         accept_languages.push_back(lang);
     }
 
     std::string new_accept_languages_str = JoinString(accept_languages, ",");
     user_prefs->SetString(prefs::kAcceptLanguages, new_accept_languages_str);
   }
@@ skipping 89 matching lines @@
 
 bool TranslatePrefs::IsListEmpty(const char* pref_id) const {
   const ListValue* blacklist = prefs_->GetList(pref_id);
   return (blacklist == NULL || blacklist->empty());
 }
 
 bool TranslatePrefs::IsDictionaryEmpty(const char* pref_id) const {
   const DictionaryValue* dict = prefs_->GetDictionary(pref_id);
   return (dict == NULL || dict->empty());
 }