Move language detection to a component

chrome/browser/translate/translate_accept_languages.cc

 // Copyright 2013 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_accept_languages.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_change_registrar.h"
 #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/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.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 "content/public/browser/notification_source.h"
 #include "net/url_request/url_fetcher.h"
 #include "ui/base/l10n/l10n_util.h"
 
 TranslateAcceptLanguages::TranslateAcceptLanguages() {
 }
 
 TranslateAcceptLanguages::~TranslateAcceptLanguages() {
 }
 
 // static
 bool TranslateAcceptLanguages::CanBeAcceptLanguage(
     const std::string& language) {
   std::string accept_language = language;
-  TranslateUtil::ToChromeLanguageSynonym(&accept_language);
+  translate::ToChromeLanguageSynonym(&accept_language);
 
   const std::string locale = g_browser_process->GetApplicationLocale();
   std::vector<std::string> accept_language_codes;
   l10n_util::GetAcceptLanguagesForLocale(locale, &accept_language_codes);
 
   if (std::find(accept_language_codes.begin(),
                 accept_language_codes.end(),
                 accept_language) != accept_language_codes.end()) {
     return true;
   }
@@ skipping 23 matching lines @@
         prefs::kAcceptLanguages,
         base::Bind(&TranslateAcceptLanguages::InitAcceptLanguages,
                    base::Unretained(this),
                    pref_service));
     pref_change_registrars_[pref_service] = pref_change_registrar;
 
     iter = accept_languages_.find(pref_service);
   }
 
   std::string accept_language = language;
-  TranslateUtil::ToChromeLanguageSynonym(&accept_language);
+  translate::ToChromeLanguageSynonym(&accept_language);
   return iter->second.count(accept_language) != 0;
 }
 
 void TranslateAcceptLanguages::InitAcceptLanguages(PrefService* prefs) {
   DCHECK(prefs);
 
   // We have been asked for this profile, build the languages.
   std::string accept_langs_str = prefs->GetString(prefs::kAcceptLanguages);
   std::vector<std::string> accept_langs_list;
   LanguageSet accept_langs_set;
@@ skipping 27 matching lines @@
   size_t count = accept_languages_.erase(pref_service);
   // We should know about this profile since we are listening for
   // notifications on it.
   DCHECK_EQ(1u, count);
   PrefChangeRegistrar* pref_change_registrar =
       pref_change_registrars_[pref_service];
   count = pref_change_registrars_.erase(pref_service);
   DCHECK_EQ(1u, count);
   delete pref_change_registrar;
 }