chrome/browser/chromeos/login/screens/network_screen_browsertest.cc - Issue 23684042: Eliminate NetworkManagerChanged

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23684042: Eliminate NetworkManagerChanged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 3 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.cc ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7c88c21497f327664ea1183082f42a1942754802..a69145b72b57b3b553bb4c01dd374ec92b398f65 100644

--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {

EXPECT_CALL(*mock_network_state_helper_, IsConnecting())

.WillOnce((Return(true)));

// EXPECT_FALSE(actor_->IsContinueEnabled());

- network_screen_->NetworkManagerChanged();

+ network_screen_->UpdateStatus();

EXPECT_CALL(*mock_network_state_helper_, IsConnected())

.Times(2)

@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {

// TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570

// EXPECT_FALSE(actor_->IsContinueEnabled());

// EXPECT_FALSE(actor_->IsConnecting());

- network_screen_->NetworkManagerChanged();

+ network_screen_->UpdateStatus();

// EXPECT_TRUE(actor_->IsContinueEnabled());

EmulateContinueButtonExit(network_screen_);

@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {

EXPECT_CALL(*mock_network_state_helper_, IsConnecting())

.WillOnce((Return(true)));

// EXPECT_FALSE(actor_->IsContinueEnabled());

- network_screen_->NetworkManagerChanged();

+ network_screen_->UpdateStatus();

EXPECT_CALL(*mock_network_state_helper_, IsConnected())

.Times(2)