chrome/browser/chromeos/login/screens/update_screen_browsertest.cc - Issue 14113053: chrome: Use base::MessageLoop. (Part 3)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_tester.cc ('k') | chrome/browser/chromeos/login/simple_web_view_dialog.cc » ('j') | no next file with comments »

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 "chrome/browser/chromeos/cros/mock_network_library.h"	7 #include "chrome/browser/chromeos/cros/mock_network_library.h"

8 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"	8 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"

9 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"	9 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"

10 #include "chrome/browser/chromeos/login/screens/update_screen.h"	10 #include "chrome/browser/chromeos/login/screens/update_screen.h"

(...skipping 335 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
346 // Second portal detection also returns NULL network and undefined	346 // Second portal detection also returns NULL network and undefined

347 // results. In this case, offline message should be displayed.	347 // results. In this case, offline message should be displayed.

348 EXPECT_CALL(*mock_error_screen_actor_,	348 EXPECT_CALL(*mock_error_screen_actor_,

349 SetUIState(ErrorScreen::UI_STATE_UPDATE))	349 SetUIState(ErrorScreen::UI_STATE_UPDATE))

350 .Times(1);	350 .Times(1);

351 EXPECT_CALL(*mock_error_screen_actor_,	351 EXPECT_CALL(*mock_error_screen_actor_,

352 SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE, std::string()))	352 SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE, std::string()))

353 .Times(1);	353 .Times(1);

354 EXPECT_CALL(*mock_screen_observer_, ShowErrorScreen())	354 EXPECT_CALL(*mock_screen_observer_, ShowErrorScreen())

355 .Times(1);	355 .Times(1);

356 MessageLoop::current()->RunUntilIdle();	356 base::MessageLoop::current()->RunUntilIdle();

357 NotifyPortalDetectionCompleted();	357 NotifyPortalDetectionCompleted();

358 }	358 }

359	359

360 } // namespace chromeos	360 } // namespace chromeos

OLD	NEW