OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/screens/update_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/update_screen.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 mock_error_screen_.reset(new MockErrorScreen( | 76 mock_error_screen_.reset(new MockErrorScreen( |
77 mock_base_screen_delegate_.get(), mock_network_error_view_.get())); | 77 mock_base_screen_delegate_.get(), mock_network_error_view_.get())); |
78 EXPECT_CALL(*mock_base_screen_delegate_, ShowCurrentScreen()) | 78 EXPECT_CALL(*mock_base_screen_delegate_, ShowCurrentScreen()) |
79 .Times(AnyNumber()); | 79 .Times(AnyNumber()); |
80 EXPECT_CALL(*mock_base_screen_delegate_, GetErrorScreen()) | 80 EXPECT_CALL(*mock_base_screen_delegate_, GetErrorScreen()) |
81 .Times(AnyNumber()) | 81 .Times(AnyNumber()) |
82 .WillRepeatedly(Return(mock_error_screen_.get())); | 82 .WillRepeatedly(Return(mock_error_screen_.get())); |
83 | 83 |
84 WizardInProcessBrowserTest::SetUpOnMainThread(); | 84 WizardInProcessBrowserTest::SetUpOnMainThread(); |
85 | 85 |
86 ASSERT_TRUE(WizardController::default_controller() != NULL); | 86 ASSERT_TRUE(WizardController::default_controller() != nullptr); |
87 update_screen_ = UpdateScreen::Get(WizardController::default_controller()); | 87 update_screen_ = UpdateScreen::Get( |
88 ASSERT_TRUE(update_screen_ != NULL); | 88 WizardController::default_controller()->screen_manager()); |
| 89 ASSERT_TRUE(update_screen_ != nullptr); |
89 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 90 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
90 update_screen_); | 91 update_screen_); |
91 update_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); | 92 update_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); |
92 } | 93 } |
93 | 94 |
94 void TearDownOnMainThread() override { | 95 void TearDownOnMainThread() override { |
95 WizardInProcessBrowserTest::TearDownOnMainThread(); | 96 WizardInProcessBrowserTest::TearDownOnMainThread(); |
96 mock_error_screen_.reset(); | 97 mock_error_screen_.reset(); |
97 mock_network_error_view_.reset(); | 98 mock_network_error_view_.reset(); |
98 } | 99 } |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); | 410 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); |
410 EXPECT_CALL(*mock_base_screen_delegate_, | 411 EXPECT_CALL(*mock_base_screen_delegate_, |
411 OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _)) | 412 OnExit(_, ScreenExitCode::UPDATE_ERROR_CHECKING_FOR_UPDATE, _)) |
412 .Times(1); | 413 .Times(1); |
413 | 414 |
414 update_screen_->OnConnectRequested(); | 415 update_screen_->OnConnectRequested(); |
415 base::RunLoop().RunUntilIdle(); | 416 base::RunLoop().RunUntilIdle(); |
416 } | 417 } |
417 | 418 |
418 } // namespace chromeos | 419 } // namespace chromeos |
OLD | NEW |