Move TranslateLanguageList to the Translate component

chrome/browser/ui/webui/translate_internals/translate_internals_handler.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/ui/webui/translate_internals/translate_internals_handler.h"
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_error_details.h"
 #include "components/translate/core/browser/translate_event_details.h"
 #include "components/translate/core/common/language_detection_details.h"
+#include "components/translate/core/common/translate_pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 
 TranslateInternalsHandler::TranslateInternalsHandler() {
   TranslateManager::GetInstance()->AddObserver(this);
+  TranslateLanguageList* language_list =
+      TranslateDownloadManager::GetInstance()->language_list();
+  if (!language_list) {
+    NOTREACHED();
+    return;
+  }
+
+  event_subscription_ = language_list->RegisterEventCallback(base::Bind(
+      &TranslateInternalsHandler::OnTranslateEvent, base::Unretained(this)));
 }
 
 TranslateInternalsHandler::~TranslateInternalsHandler() {
   TranslateManager::GetInstance()->RemoveObserver(this);
+  // |event_subscription_| is deleted automatically and un-registers the

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

nit: blank line before.

+  // callback automatically.
 }
 
 void TranslateInternalsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("removePrefItem", base::Bind(
       &TranslateInternalsHandler::OnRemovePrefItem, base::Unretained(this)));
   web_ui()->RegisterMessageCallback("requestInfo", base::Bind(
       &TranslateInternalsHandler::OnRequestInfo, base::Unretained(this)));
 }
 
 void TranslateInternalsHandler::OnLanguageDetection(
@@ skipping 120 matching lines @@
       dict.Set(key, pref->GetValue()->DeepCopy());
   }
 
   SendMessageToJs("prefsUpdated", dict);
 }
 
 void TranslateInternalsHandler::SendSupportedLanguagesToJs() {
   base::DictionaryValue dict;
 
   std::vector<std::string> languages;
-  TranslateManager::GetSupportedLanguages(&languages);
+  TranslateDownloadManager::GetSupportedLanguages(&languages);
   base::Time last_updated =
-      TranslateManager::GetSupportedLanguagesLastUpdated();
+      TranslateDownloadManager::GetSupportedLanguagesLastUpdated();
 
   base::ListValue* languages_list = new base::ListValue();
   base::ListValue* alpha_languages_list = new base::ListValue();
   for (std::vector<std::string>::iterator it = languages.begin();
        it != languages.end(); ++it) {
     const std::string& lang = *it;
     languages_list->Append(new base::StringValue(lang));
-    if (TranslateManager::IsAlphaLanguage(lang))
+    if (TranslateDownloadManager::IsAlphaLanguage(lang))
       alpha_languages_list->Append(new base::StringValue(lang));
   }
 
   dict.Set("languages", languages_list);
   dict.Set("alpha_languages", alpha_languages_list);
   dict.Set("last_updated",
            new base::FundamentalValue(last_updated.ToJsTime()));
   SendMessageToJs("supportedLanguagesUpdated", dict);
 }