Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2201)

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 863263006: Migrating UpdateScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_base_screen_delegate.h" 9 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
10 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 10 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 scoped_ptr<MockErrorScreenActor> mock_error_screen_actor_; 119 scoped_ptr<MockErrorScreenActor> mock_error_screen_actor_;
120 scoped_ptr<MockErrorScreen> mock_error_screen_; 120 scoped_ptr<MockErrorScreen> mock_error_screen_;
121 UpdateScreen* update_screen_; 121 UpdateScreen* update_screen_;
122 NetworkPortalDetectorTestImpl* network_portal_detector_; 122 NetworkPortalDetectorTestImpl* network_portal_detector_;
123 123
124 private: 124 private:
125 DISALLOW_COPY_AND_ASSIGN(UpdateScreenTest); 125 DISALLOW_COPY_AND_ASSIGN(UpdateScreenTest);
126 }; 126 };
127 127
128 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestBasic) { 128 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestBasic) {
129 ASSERT_TRUE(update_screen_->actor_ != NULL); 129 ASSERT_TRUE(update_screen_->view_ != NULL);
130 } 130 }
131 131
132 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) { 132 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) {
133 update_screen_->SetIgnoreIdleStatus(true); 133 update_screen_->SetIgnoreIdleStatus(true);
134 UpdateEngineClient::Status status; 134 UpdateEngineClient::Status status;
135 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE; 135 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
136 update_screen_->UpdateStatusChanged(status); 136 update_screen_->UpdateStatusChanged(status);
137 status.status = UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE; 137 status.status = UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE;
138 update_screen_->UpdateStatusChanged(status); 138 update_screen_->UpdateStatusChanged(status);
139 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE; 139 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); 380 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
381 EXPECT_CALL(*mock_base_screen_delegate_, 381 EXPECT_CALL(*mock_base_screen_delegate_,
382 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE, 382 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
383 _)).Times(1); 383 _)).Times(1);
384 384
385 update_screen_->OnConnectToNetworkRequested(); 385 update_screen_->OnConnectToNetworkRequested();
386 base::MessageLoop::current()->RunUntilIdle(); 386 base::MessageLoop::current()->RunUntilIdle();
387 } 387 }
388 388
389 } // namespace chromeos 389 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen_actor.h ('k') | chrome/browser/chromeos/login/screens/update_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698