Translate: make alpha language support enabled by default

chrome/browser/translate/translate_language_list.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_language_list.h"
 
 #include <set>
 
-#include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/translate/translate_url_util.h"
-#include "chrome/common/chrome_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/url_util.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 // The default list of languages the Google translation server supports.
@@ skipping 122 matching lines @@
   set->clear();
   // ... and replace it with the values we just fetched from the server.
   for (DictionaryValue::Iterator iter(*target_languages);
        !iter.IsAtEnd();
        iter.Advance()) {
     // TODO(toyoshim): Check if UI libraries support adding locale.
     set->insert(iter.key());
   }
 }
 
-net::URLFetcher* CreateAndStartFetch(const GURL& url,
+net::URLFetcher* CreateAndStartFetch(int id,
+                                     const GURL& url,
                                      net::URLFetcherDelegate* delegate) {
   DCHECK(delegate);
   VLOG(9) << "Fetch supporting language list from: " << url.spec().c_str();
 
   scoped_ptr<net::URLFetcher> fetcher;
-  fetcher.reset(net::URLFetcher::Create(1,
+  fetcher.reset(net::URLFetcher::Create(id,
                                         url,
                                         net::URLFetcher::GET,
                                         delegate));
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES);
   fetcher->SetRequestContext(g_browser_process->system_request_context());
   fetcher->SetMaxRetriesOn5xx(kMaxRetryLanguageListFetch);
   fetcher->Start();
 
   return fetcher.release();
@@ skipping 78 matching lines @@
     return;
 
   // Fetch the stable language list.
   GURL language_list_fetch_url = GURL(kLanguageListFetchURL);
   language_list_fetch_url =
       TranslateURLUtil::AddHostLocaleToUrl(language_list_fetch_url);
   language_list_fetch_url =
       TranslateURLUtil::AddApiKeyToUrl(language_list_fetch_url);
 
   language_list_fetcher_.reset(
-      CreateAndStartFetch(language_list_fetch_url, this));
-
-  // TODO(toyoshim): Make it enabled by default. http://crbug.com/242178
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableTranslateAlphaLanguages))
-    return;
+      CreateAndStartFetch(1, language_list_fetch_url, this));
 
   // Fetch the alpha language list.
   language_list_fetch_url = net::AppendQueryParameter(
       language_list_fetch_url,
       kAlphaLanguageQueryName,
       kAlphaLanguageQueryValue);
 
   alpha_language_list_fetcher_.reset(
-      CreateAndStartFetch(language_list_fetch_url, this));
+      CreateAndStartFetch(2, language_list_fetch_url, this));
 }
 
 void TranslateLanguageList::UpdateSupportedLanguages() {
   all_supported_languages_.clear();
   std::set<std::string>::const_iterator iter;
   for (iter = supported_languages_.begin();
       iter != supported_languages_.end();
       ++iter)
     all_supported_languages_.insert(*iter);
   for (iter = supported_alpha_languages_.begin();
       iter != supported_alpha_languages_.end();
       ++iter)
     all_supported_languages_.insert(*iter);
 }