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

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

 // Copyright (c) 2012 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/wizard_controller.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
@@ skipping 111 matching lines @@
 
   virtual bool IsInitializationComplete() const override {
     return true;
   }
 
  private:
   virtual ~PrefStoreStub() {}
 };
 
 struct SwitchLanguageTestData {
-  SwitchLanguageTestData() : success(false), done(false) {}
+  SwitchLanguageTestData() : result("", "", false), done(false) {}
 
-  std::string requested_locale;
-  std::string loaded_locale;
-  bool success;
+  locale_util::LanguageSwitchResult result;
   bool done;
 };
 
 void OnLocaleSwitched(SwitchLanguageTestData* self,
-                      const std::string& locale,
-                      const std::string& loaded_locale,
-                      const bool success) {
-  self->requested_locale = locale;
-  self->loaded_locale = loaded_locale;
-  self->success = success;
+                      const locale_util::LanguageSwitchResult& result) {
+  self->result = result;
   self->done = true;
 }
 
 void RunSwitchLanguageTest(const std::string& locale,
                                   const std::string& expected_locale,
                                   const bool expect_success) {
   SwitchLanguageTestData data;
-  scoped_ptr<locale_util::SwitchLanguageCallback> callback(
-      new locale_util::SwitchLanguageCallback(
-          base::Bind(&OnLocaleSwitched, base::Unretained(&data))));
-  locale_util::SwitchLanguage(locale, true, false, callback.Pass());
+  locale_util::SwitchLanguageCallback callback(
+      base::Bind(&OnLocaleSwitched, base::Unretained(&data)));
+  locale_util::SwitchLanguage(locale, true, false, callback);
 
   // Token writing moves control to BlockingPool and back.
   content::RunAllBlockingPoolTasksUntilIdle();
 
   EXPECT_EQ(data.done, true);
-  EXPECT_EQ(data.requested_locale, locale);
-  EXPECT_EQ(data.loaded_locale, expected_locale);
-  EXPECT_EQ(data.success, expect_success);
+  EXPECT_EQ(data.result.requested_locale, locale);
+  EXPECT_EQ(data.result.loaded_locale, expected_locale);
+  EXPECT_EQ(data.result.success, expect_success);
 }
 
 void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) {
   AccessibilityManager* a11y = AccessibilityManager::Get();
   CrasAudioHandler* cras = CrasAudioHandler::Get();
 
   // Audio output is at |volume_percent| and |mute_on|. Spoken feedback
   // is disabled.
   cras->SetOutputVolumePercent(volume_percent);
   cras->SetOutputMute(mute_on);
@@ skipping 1013 matching lines @@
 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
 // UI and logic is ready. http://crbug.com/127016
 
 // TODO(dzhioev): Add tests for controller/host pairing flow.
 // http://crbug.com/375191
 
 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
                add_tests_for_new_control_flow_you_just_introduced);
 
 }  // namespace chromeos