Fix crash in ResolveLanguageListOnBlockingPool

chrome/browser/ui/webui/chromeos/login/l10n_util.cc

 // Copyright 2014 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/chromeos/login/l10n_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 414 matching lines @@
     scoped_ptr<chromeos::locale_util::LanguageSwitchResult>
         language_switch_result,
     UILanguageListResolvedCallback callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   scoped_ptr<scoped_ptr<base::ListValue>> new_language_list(
       new scoped_ptr<base::ListValue>());
   scoped_ptr<std::string> new_language_list_locale(new std::string);
   scoped_ptr<std::string> new_selected_language(new std::string);
 
-  content::BrowserThread::GetBlockingPool()->PostTaskAndReply(
-      FROM_HERE,
+  base::Closure resolve_on_pool =
       base::Bind(&ResolveLanguageListOnBlockingPool,
                  base::Owned(language_switch_result.release()),
                  base::Unretained(new_language_list.get()),
                  base::Unretained(new_language_list_locale.get()),
-                 base::Unretained(new_selected_language.get())),
+                 base::Unretained(new_selected_language.get()));
+
+  base::Closure on_language_list_resolved =
       base::Bind(&OnLanguageListResolved,
                  callback,
                  base::Passed(new_language_list.Pass()),
                  base::Passed(new_language_list_locale.Pass()),
-                 base::Passed(new_selected_language.Pass())));
+                 base::Passed(new_selected_language.Pass()));
+
+  content::BrowserThread::GetBlockingPool()->PostTaskAndReply(
+      FROM_HERE, resolve_on_pool, on_language_list_resolved);
 }
 
 scoped_ptr<base::ListValue> GetMinimalUILanguageList() {
   const std::string application_locale =
       g_browser_process->GetApplicationLocale();
   base::string16 language_native_display_name =
       l10n_util::GetDisplayNameForLocale(
           application_locale, application_locale, true);
 
   scoped_ptr<base::ListValue> language_list(new base::ListValue());
@@ skipping 158 matching lines @@
 scoped_ptr<base::DictionaryValue> GetCurrentKeyboardLayout() {
   const input_method::InputMethodDescriptor current_input_method =
       input_method::InputMethodManager::Get()
           ->GetActiveIMEState()
           ->GetCurrentInputMethod();
   return CreateInputMethodsEntry(current_input_method,
                                  current_input_method.id());
 }
 
 }  // namespace chromeos