chrome/browser/chromeos/login/update_screen_browsertest.cc - Issue 6899025: Show hardware addresses for wifi and ethernet networks.

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

Issue 6899025: Show hardware addresses for wifi and ethernet networks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: z Created 9 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 | Annotate | Revision Log

« chrome/browser/chromeos/cros/network_library.cc ('K') | « chrome/browser/chromeos/login/network_screen_browsertest.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | chrome/browser/chromeos/status/network_menu.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/chromeos/cros/mock_login_library.h"	5 #include "chrome/browser/chromeos/cros/mock_login_library.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/cros/mock_update_library.h"	7 #include "chrome/browser/chromeos/cros/mock_update_library.h"

8 #include "chrome/browser/chromeos/login/mock_screen_observer.h"	8 #include "chrome/browser/chromeos/login/mock_screen_observer.h"

9 #include "chrome/browser/chromeos/login/update_screen.h"	9 #include "chrome/browser/chromeos/login/update_screen.h"

10 #include "chrome/browser/chromeos/login/wizard_controller.h"	10 #include "chrome/browser/chromeos/login/wizard_controller.h"

11 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"	11 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 .WillOnce(Invoke(RequestUpdateCheckSuccess));	56 .WillOnce(Invoke(RequestUpdateCheckSuccess));

57	57

58 mock_network_library_ = cros_mock_->mock_network_library();	58 mock_network_library_ = cros_mock_->mock_network_library();

59 EXPECT_CALL(*mock_network_library_, Connected())	59 EXPECT_CALL(*mock_network_library_, Connected())

60 .Times(1) // also called by NetworkMenu::InitMenuItems()	60 .Times(1) // also called by NetworkMenu::InitMenuItems()

61 .WillRepeatedly((Return(false)))	61 .WillRepeatedly((Return(false)))

62 .RetiresOnSaturation();	62 .RetiresOnSaturation();

63 EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))	63 EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))

64 .Times(1)	64 .Times(1)

65 .RetiresOnSaturation();	65 .RetiresOnSaturation();

	66 EXPECT_CALL(*mock_network_library_, FindWifiDevices())

	67 .WillRepeatedly((Return(NetworkDeviceVector())));

	68 EXPECT_CALL(*mock_network_library_, FindEthernetDevices())

	69 .WillRepeatedly((Return(NetworkDeviceVector())));

66 }	70 }

67	71

68 virtual void TearDownInProcessBrowserTestFixture() {	72 virtual void TearDownInProcessBrowserTestFixture() {

69 cros_mock_->test_api()->SetUpdateLibrary(NULL, true);	73 cros_mock_->test_api()->SetUpdateLibrary(NULL, true);

70 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();	74 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();

71 }	75 }

72	76

73 MockLoginLibrary* mock_login_library_;	77 MockLoginLibrary* mock_login_library_;

74 MockUpdateLibrary* mock_update_library_;	78 MockUpdateLibrary* mock_update_library_;

75 MockNetworkLibrary* mock_network_library_;	79 MockNetworkLibrary* mock_network_library_;

(...skipping 173 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
249 .WillRepeatedly(ReturnRef(status));	253 .WillRepeatedly(ReturnRef(status));

250 EXPECT_CALL(*mock_screen_observer,	254 EXPECT_CALL(*mock_screen_observer,

251 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))	255 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))

252 .Times(1);	256 .Times(1);

253 update_screen->UpdateStatusChanged(mock_update_library_);	257 update_screen->UpdateStatusChanged(mock_update_library_);

254	258

255 controller()->set_observer(NULL);	259 controller()->set_observer(NULL);

256 }	260 }

257	261

258 } // namespace chromeos	262 } // namespace chromeos

OLD	NEW