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

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 9829474554e89dfe8f942cc86ae2e9f5082710a2..e231e2eb46cd8d51dd713b3c615698943db5bab5 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,14 +98,13 @@ void TermsOfServiceScreenHandler::Show() {
   }
 
   // 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() {
@@ -137,9 +136,7 @@ void TermsOfServiceScreenHandler::Initialize() {
 }
 
 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())