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

chrome/browser/chromeos/login/ui/login_display_host_impl.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/chromeos/login/ui/login_display_host_impl.h"
 
 #include <vector>
 
 #include "ash/audio/sounds.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 182 matching lines @@
   const std::string first_screen_name;
   const chromeos::StartupCustomizationDocument* const startup_manifest;
   chromeos::LoginDisplayHost* const display_host;
 
   // lock UI while resource bundle is being reloaded.
   chromeos::InputEventsBlocker events_blocker;
 };
 
 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);
 }
 
 void EnableSystemSoundsForAccessibility() {
   chromeos::AccessibilityManager::Get()->EnableSystemSounds(true);
 }
 
 // A login implementation of WidgetDelegate.
@@ skipping 1070 matching lines @@
   // Chrome locale. Otherwise it will be lost if Chrome restarts.
   // Don't need to schedule pref save because setting initial local
   // will enforce preference saving.
   prefs->SetString(prefs::kApplicationLocale, locale);
   StartupUtils::SetInitialLocale(locale);
 
   scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> data(
       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