cros: Replace WizardController string constants with OobeScreen values.

chrome/browser/chromeos/login/screens/update_screen_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/screens/update_screen.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 26 matching lines @@
 
 namespace {
 
 const char kStubEthernetGuid[] = "eth0";
 const char kStubWifiGuid[] = "wlan0";
 
 }  // namespace
 
 class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
-  UpdateScreenTest() : WizardInProcessBrowserTest("update"),
-                       fake_update_engine_client_(NULL),
-                       network_portal_detector_(NULL) {
-  }
+  UpdateScreenTest()
+      : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_UPDATE),
+        fake_update_engine_client_(nullptr),
+        network_portal_detector_(nullptr) {}
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
     fake_update_engine_client_ = new FakeUpdateEngineClient;
     chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
         std::unique_ptr<UpdateEngineClient>(fake_update_engine_client_));
 
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
 
     // Setup network portal detector to return online state for both
@@ skipping 114 matching lines @@
   status.status = UpdateEngineClient::UPDATE_STATUS_FINALIZING;
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
   update_screen_->UpdateStatusChanged(status);
   // UpdateStatusChanged(status) calls RebootAfterUpdate().
   EXPECT_EQ(1, fake_update_engine_client_->reboot_after_update_call_count());
   // Check that OOBE will resume back at this screen.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(StartupUtils::IsOobeCompleted());
-  EXPECT_EQ(
-      update_screen_->screen_id(),
-      g_browser_process->local_state()->GetString(prefs::kOobeScreenPending));
+  EXPECT_EQ(update_screen_->screen_id(),
+            GetOobeScreenFromName(g_browser_process->local_state()->GetString(
+                prefs::kOobeScreenPending)));
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
   // First, cancel the update that is already in progress.
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_NOUPDATE, _)).Times(1);
   update_screen_->CancelUpdate();
 
   fake_update_engine_client_->set_update_check_result(
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
@@ skipping 204 matching lines @@
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
   EXPECT_CALL(*mock_base_screen_delegate_,
               OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
                      _)).Times(1);
 
   update_screen_->OnConnectRequested();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos