Move TranslateLanguageList to the Translate component

components/translate/core/browser/translate_download_manager.cc

Index: components/translate/core/browser/translate_download_manager.cc
diff --git a/components/translate/core/browser/translate_download_manager.cc b/components/translate/core/browser/translate_download_manager.cc
index c688d2177ea29870eefae36780b34e9a02fa845b..df9f81a7bfde3b5665e7b5d62a7a67b59aff33ad 100644
--- a/components/translate/core/browser/translate_download_manager.cc
+++ b/components/translate/core/browser/translate_download_manager.cc
@@ -4,13 +4,104 @@
 
 #include "components/translate/core/browser/translate_download_manager.h"
 
+#include "base/command_line.h"
 #include "base/memory/singleton.h"
+#include "base/prefs/pref_service.h"
+#include "components/translate/core/common/translate_pref_names.h"
+#include "components/translate/core/common/translate_switches.h"
 
 // static
 TranslateDownloadManager* TranslateDownloadManager::GetInstance() {
   return Singleton<TranslateDownloadManager>::get();
 }
 
-TranslateDownloadManager::TranslateDownloadManager() {}
+TranslateDownloadManager::TranslateDownloadManager()
+    : language_list_(new TranslateLanguageList) {}
 
 TranslateDownloadManager::~TranslateDownloadManager() {}
+
+void TranslateDownloadManager::Shutdown() {
+  language_list_.reset();
+}
+
+// static
+void TranslateDownloadManager::RequestLanguageList() {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return;
+  }
+
+  language_list->RequestLanguageList();
+}
+
+// static
+void TranslateDownloadManager::RequestLanguageList(PrefService* prefs) {
+  // We don't want to do this when translate is disabled.
+  DCHECK(prefs != NULL);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          translate::switches::kDisableTranslate) ||
+      !prefs->GetBoolean(prefs::kEnableTranslate)) {
+    return;
+  }
+
+  RequestLanguageList();
+}
+
+// static
+void TranslateDownloadManager::GetSupportedLanguages(
+    std::vector<std::string>* languages) {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {

[blundell, 2014/01/31 10:49:45]

Is it ever OK for TranslateDownloadManager::language_list() to return NULL? If
not, should this NOTREACHED() everywhere just be a DCHECK in the method?

[droger, 2014/01/31 13:40:49]

I agree, but the existing code was like this: every time the language list was
NULL, there was a NOTREACHED but it was handled gracefully.
I am ok to change this logic, but maybe not as part of this CL.

+    NOTREACHED();
+    return;
+  }
+
+  language_list->GetSupportedLanguages(languages);
+}
+
+// static
+base::Time TranslateDownloadManager::GetSupportedLanguagesLastUpdated() {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return base::Time();
+  }
+
+  return language_list->last_updated();
+}
+
+// static
+std::string TranslateDownloadManager::GetLanguageCode(
+    const std::string& chrome_locale) {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return chrome_locale;
+  }
+
+  return language_list->GetLanguageCode(chrome_locale);
+}
+
+// static
+bool TranslateDownloadManager::IsSupportedLanguage(
+    const std::string& language) {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return false;
+  }
+
+  return language_list->IsSupportedLanguage(language);
+}
+
+// static
+bool TranslateDownloadManager::IsAlphaLanguage(const std::string& language) {
+  TranslateLanguageList* language_list = GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return false;
+  }
+
+  return language_list->IsAlphaLanguage(language);
+}