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

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

 // Copyright (c) 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/ui/webui/chromeos/login/terms_of_service_screen_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 80 matching lines @@
           ->GetString(prefs::kApplicationLocale);
 
   if (locale.empty() || locale == g_browser_process->GetApplicationLocale()) {
     // If the user has not chosen a UI locale yet or the chosen locale matches
     // the current UI locale, show the screen immediately.
     DoShow();
     return;
   }
 
   // Switch to the user's UI locale before showing the screen.
-  scoped_ptr<locale_util::SwitchLanguageCallback> callback(
-      new locale_util::SwitchLanguageCallback(
-          base::Bind(&TermsOfServiceScreenHandler::OnLanguageChangedCallback,
-                     base::Unretained(this))));
+  locale_util::SwitchLanguageCallback callback(
+      base::Bind(&TermsOfServiceScreenHandler::OnLanguageChangedCallback,
+                 base::Unretained(this)));
   locale_util::SwitchLanguage(locale,
                               true,   // enable_locale_keyboard_layouts
                               false,  // login_layouts_only
-                              callback.Pass());
+                              callback);
 }
 
 void TermsOfServiceScreenHandler::Hide() {
 }
 
 void TermsOfServiceScreenHandler::SetDomain(const std::string& domain) {
   domain_ = domain;
   UpdateDomainInUI();
 }
 
@@ skipping 11 matching lines @@
 }
 
 void TermsOfServiceScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
   }
 }
 
 void TermsOfServiceScreenHandler::OnLanguageChangedCallback(
-    const std::string& requested_locale,
-    const std::string& loaded_locale,
-    const bool success) {
+    const locale_util::LanguageSwitchResult& result) {
   // Update the screen contents to the new locale.
   base::DictionaryValue localized_strings;
   static_cast<OobeUI*>(web_ui()->GetController())
       ->GetLocalizedStrings(&localized_strings);
   core_oobe_actor_->ReloadContent(localized_strings);
 
   DoShow();
 }
 
 void TermsOfServiceScreenHandler::DoShow() {
@@ skipping 59 matching lines @@
   // and continue" button should not be accessible. If the user managed to
   // activate it somehow anway, do not treat this as acceptance of the Terms
   // and Conditions and end the session instead, as if the user had declined.
   if (terms_of_service_.empty())
     screen_->OnDecline();
   else
     screen_->OnAccept();
 }
 
 }  // namespace chromeos