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

Unified Diff: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
index 163cc7d27865fadab6c50da11f49e948ca36c586..3d5ea73e01c44891171824caaeb8e042762082a4 100644
--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
@@ -121,39 +121,39 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {
EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
.WillOnce((Return(true)));
- // EXPECT_FALSE(actor_->IsContinueEnabled());
+ // EXPECT_FALSE(view_->IsContinueEnabled());
network_screen_->UpdateStatus();
EXPECT_CALL(*mock_network_state_helper_, IsConnected())
.Times(2)
.WillRepeatedly(Return(true));
- // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
- // EXPECT_FALSE(actor_->IsContinueEnabled());
- // EXPECT_FALSE(actor_->IsConnecting());
+ // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
+ // EXPECT_FALSE(view_->IsContinueEnabled());
+ // EXPECT_FALSE(view_->IsConnecting());
network_screen_->UpdateStatus();
- // EXPECT_TRUE(actor_->IsContinueEnabled());
+ // EXPECT_TRUE(view_->IsContinueEnabled());
EmulateContinueButtonExit(network_screen_);
}
IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
.WillOnce((Return(true)));
- // EXPECT_FALSE(actor_->IsContinueEnabled());
+ // EXPECT_FALSE(view_->IsContinueEnabled());
network_screen_->UpdateStatus();
EXPECT_CALL(*mock_network_state_helper_, IsConnected())
.Times(2)
.WillRepeatedly(Return(false));
- // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
- // EXPECT_FALSE(actor_->IsContinueEnabled());
- // EXPECT_FALSE(actor_->IsConnecting());
+ // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
+ // EXPECT_FALSE(view_->IsContinueEnabled());
+ // EXPECT_FALSE(view_->IsConnecting());
network_screen_->OnConnectionTimeout();
// Close infobubble with error message - it makes the test stable.
- // EXPECT_FALSE(actor_->IsContinueEnabled());
- // EXPECT_FALSE(actor_->IsConnecting());
- // actor_->ClearErrors();
+ // EXPECT_FALSE(view_->IsContinueEnabled());
+ // EXPECT_FALSE(view_->IsConnecting());
+ // view_->ClearErrors();
}
class HandsOffNetworkScreenTest : public NetworkScreenTest {
« no previous file with comments | « chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc ('k') | chrome/browser/chromeos/login/screens/reset_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698