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

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

Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
index d12fca4ba9cb37122f7ebe53166fe7f30b33e171..f6cc021d2ecac6104351501f8e6f64f36bdf4998 100644
--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
@@ -42,9 +43,8 @@ class TermsOfServiceScreenHandler : public BaseScreenHandler,
   virtual void Initialize() override;
 
   // Callback invoked after the UI locale has been changed.
-  void OnLanguageChangedCallback(const std::string& requested_locale,
-                                 const std::string& loaded_locale,
-                                 const bool success);
+  void OnLanguageChangedCallback(
+      const locale_util::LanguageSwitchResult& result);
 
   // Switch to the user's preferred input method and show the screen. This
   // method is called after it has been ensured that the current UI locale