chrome/browser/chromeos/login/update_screen_browsertest.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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/update_screen_browsertest.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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

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/message_loop.h"	5 #include "base/message_loop.h"

6 #include "chrome/browser/chromeos/cros/mock_network_library.h"	6 #include "chrome/browser/chromeos/cros/mock_network_library.h"

7 #include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

8 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"

9 #include "chrome/browser/chromeos/dbus/mock_update_engine_client.h"

10 #include "chrome/browser/chromeos/login/mock_screen_observer.h"	7 #include "chrome/browser/chromeos/login/mock_screen_observer.h"

11 #include "chrome/browser/chromeos/login/update_screen.h"	8 #include "chrome/browser/chromeos/login/update_screen.h"

12 #include "chrome/browser/chromeos/login/wizard_controller.h"	9 #include "chrome/browser/chromeos/login/wizard_controller.h"

13 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"	10 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"

	11 #include "chromeos/dbus/mock_dbus_thread_manager.h"

	12 #include "chromeos/dbus/mock_session_manager_client.h"

	13 #include "chromeos/dbus/mock_update_engine_client.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15	15

16 namespace chromeos {	16 namespace chromeos {

17 using ::testing::_;	17 using ::testing::_;

18 using ::testing::AnyNumber;	18 using ::testing::AnyNumber;

19 using ::testing::AtLeast;	19 using ::testing::AtLeast;

20 using ::testing::Return;	20 using ::testing::Return;

21 using ::testing::ReturnRef;	21 using ::testing::ReturnRef;

22 using ::testing::Invoke;	22 using ::testing::Invoke;

23 using chromeos::UpdateEngineClient;	23 using chromeos::UpdateEngineClient;

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
212 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())	212 EXPECT_CALL(*mock_update_engine_client_, GetLastStatus())

213 .Times(AtLeast(1))	213 .Times(AtLeast(1))

214 .WillRepeatedly(Return(status));	214 .WillRepeatedly(Return(status));

215 EXPECT_CALL(*mock_screen_observer_,	215 EXPECT_CALL(*mock_screen_observer_,

216 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))	216 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))

217 .Times(1);	217 .Times(1);

218 update_screen_->UpdateStatusChanged(status);	218 update_screen_->UpdateStatusChanged(status);

219 }	219 }

220	220

221 } // namespace chromeos	221 } // namespace chromeos

OLD	NEW

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