chrome/browser/chromeos/login/screens/update_screen_browsertest.cc - Issue 1547093002: Switch to standard integer types in chrome/browser/chromeos/.

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 1547093002: Switch to standard integer types in chrome/browser/chromeos/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen.h ('k') | chrome/browser/chromeos/login/screens/user_image_screen.h » ('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/macros.h"

6 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

7 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

8 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

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

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

11 #include "chrome/browser/chromeos/login/screens/network_error.h"	12 #include "chrome/browser/chromeos/login/screens/network_error.h"

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

13 #include "chrome/browser/chromeos/login/startup_utils.h"	14 #include "chrome/browser/chromeos/login/startup_utils.h"

14 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"	15 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"

15 #include "chrome/browser/chromeos/login/wizard_controller.h"	16 #include "chrome/browser/chromeos/login/wizard_controller.h"

(...skipping 381 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);	398 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);

398 EXPECT_CALL(*mock_base_screen_delegate_,	399 EXPECT_CALL(*mock_base_screen_delegate_,

399 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,	400 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,

400 _)).Times(1);	401 _)).Times(1);

401	402

402 update_screen_->OnConnectRequested();	403 update_screen_->OnConnectRequested();

403 base::MessageLoop::current()->RunUntilIdle();	404 base::MessageLoop::current()->RunUntilIdle();

404 }	405 }

405	406

406 } // namespace chromeos	407 } // namespace chromeos

OLD	NEW