Revert of Revert of Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (patchs…

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

Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
index e231e2eb46cd8d51dd713b3c615698943db5bab5..9829474554e89dfe8f942cc86ae2e9f5082710a2 100644
--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
@@ -98,13 +98,14 @@
   }
 
   // Switch to the user's UI locale before showing the screen.
-  locale_util::SwitchLanguageCallback callback(
-      base::Bind(&TermsOfServiceScreenHandler::OnLanguageChangedCallback,
-                 base::Unretained(this)));
+  scoped_ptr<locale_util::SwitchLanguageCallback> callback(
+      new locale_util::SwitchLanguageCallback(
+          base::Bind(&TermsOfServiceScreenHandler::OnLanguageChangedCallback,
+                     base::Unretained(this))));
   locale_util::SwitchLanguage(locale,
                               true,   // enable_locale_keyboard_layouts
                               false,  // login_layouts_only
-                              callback);
+                              callback.Pass());
 }
 
 void TermsOfServiceScreenHandler::Hide() {
@@ -136,7 +137,9 @@
 }
 
 void TermsOfServiceScreenHandler::OnLanguageChangedCallback(
-    const locale_util::LanguageSwitchResult& result) {
+    const std::string& requested_locale,
+    const std::string& loaded_locale,
+    const bool success) {
   // Update the screen contents to the new locale.
   base::DictionaryValue localized_strings;
   static_cast<OobeUI*>(web_ui()->GetController())