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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" |
10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" | 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 mock_error_screen_.reset( | 73 mock_error_screen_.reset( |
74 new MockErrorScreen(mock_screen_observer_.get(), | 74 new MockErrorScreen(mock_screen_observer_.get(), |
75 mock_error_screen_actor_.get())); | 75 mock_error_screen_actor_.get())); |
76 EXPECT_CALL(*mock_screen_observer_, ShowCurrentScreen()) | 76 EXPECT_CALL(*mock_screen_observer_, ShowCurrentScreen()) |
77 .Times(AnyNumber()); | 77 .Times(AnyNumber()); |
78 EXPECT_CALL(*mock_screen_observer_, GetErrorScreen()) | 78 EXPECT_CALL(*mock_screen_observer_, GetErrorScreen()) |
79 .Times(AnyNumber()) | 79 .Times(AnyNumber()) |
80 .WillRepeatedly(Return(mock_error_screen_.get())); | 80 .WillRepeatedly(Return(mock_error_screen_.get())); |
81 | 81 |
82 ASSERT_TRUE(WizardController::default_controller() != NULL); | 82 ASSERT_TRUE(WizardController::default_controller() != NULL); |
83 update_screen_ = WizardController::default_controller()->GetUpdateScreen(); | 83 update_screen_ = UpdateScreen::Get(WizardController::default_controller()); |
84 ASSERT_TRUE(update_screen_ != NULL); | 84 ASSERT_TRUE(update_screen_ != NULL); |
85 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 85 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
86 update_screen_); | 86 update_screen_); |
87 update_screen_->screen_observer_ = mock_screen_observer_.get(); | 87 update_screen_->screen_observer_ = mock_screen_observer_.get(); |
88 } | 88 } |
89 | 89 |
90 virtual void TearDownOnMainThread() OVERRIDE { | 90 virtual void TearDownOnMainThread() OVERRIDE { |
91 mock_error_screen_.reset(); | 91 mock_error_screen_.reset(); |
92 mock_error_screen_actor_.reset(); | 92 mock_error_screen_actor_.reset(); |
93 WizardInProcessBrowserTest::TearDownOnMainThread(); | 93 WizardInProcessBrowserTest::TearDownOnMainThread(); |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); | 392 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); |
393 EXPECT_CALL(*mock_screen_observer_, | 393 EXPECT_CALL(*mock_screen_observer_, |
394 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) | 394 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) |
395 .Times(1); | 395 .Times(1); |
396 | 396 |
397 update_screen_->OnConnectToNetworkRequested(); | 397 update_screen_->OnConnectToNetworkRequested(); |
398 base::MessageLoop::current()->RunUntilIdle(); | 398 base::MessageLoop::current()->RunUntilIdle(); |
399 } | 399 } |
400 | 400 |
401 } // namespace chromeos | 401 } // namespace chromeos |
OLD | NEW |