Revert "Revert of Revert of Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolve…

chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 3f792e351ca22f542738e6e966b0ee1ba47625b8..3c9b9000966fe3db5dea25a72267b3e67379e75b 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -200,11 +200,10 @@ struct ShowLoginWizardSwitchLanguageCallbackData {
 
 void OnLanguageSwitchedCallback(
     scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> self,
-    const std::string& locale,
-    const std::string& loaded_locale,
-    const bool success) {
-  if (!success)
-    LOG(WARNING) << "Locale could not be found for '" << locale << "'";
+    const chromeos::locale_util::LanguageSwitchResult& result) {
+  if (!result.success)
+    LOG(WARNING) << "Locale could not be found for '" << result.requested_locale
+                 << "'";
 
   ShowLoginWizardFinish(
       self->first_screen_name, self->startup_manifest, self->display_host);
@@ -1295,13 +1294,12 @@ void ShowLoginWizard(const std::string& first_screen_name) {
       new ShowLoginWizardSwitchLanguageCallbackData(
           first_screen_name, startup_manifest, display_host));
 
-  scoped_ptr<locale_util::SwitchLanguageCallback> callback(
-      new locale_util::SwitchLanguageCallback(
-          base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
+  locale_util::SwitchLanguageCallback callback(
+      base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
 
   // Load locale keyboards here. Hardware layout would be automatically enabled.
   locale_util::SwitchLanguage(
-      locale, true, true /* login_layouts_only */, callback.Pass());
+      locale, true, true /* login_layouts_only */, callback);
 }
 
 }  // namespace chromeos