chrome/browser/chromeos/login/update_screen_browsertest.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

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

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit tests Created 8 years 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_browsertest.cc ('k') | chrome/browser/chromeos/network_settings/onc_certificate_importer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.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/login/mock_screen_observer.h"	7 #include "chrome/browser/chromeos/login/mock_screen_observer.h"

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

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

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

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 .RetiresOnSaturation();	76 .RetiresOnSaturation();

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

78 .Times(1)	78 .Times(1)

79 .RetiresOnSaturation();	79 .RetiresOnSaturation();

80 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))	80 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))

81 .Times(AnyNumber());	81 .Times(AnyNumber());

82 EXPECT_CALL(*mock_network_library_, FindWifiDevice())	82 EXPECT_CALL(*mock_network_library_, FindWifiDevice())

83 .Times(AnyNumber());	83 .Times(AnyNumber());

84 EXPECT_CALL(*mock_network_library_, FindEthernetDevice())	84 EXPECT_CALL(*mock_network_library_, FindEthernetDevice())

85 .Times(AnyNumber());	85 .Times(AnyNumber());

86 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _, _))	86 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _))

87 .WillRepeatedly(Return(true));	87 .WillRepeatedly(Return(true));

88 }	88 }

89	89

90 virtual void SetUpOnMainThread() {	90 virtual void SetUpOnMainThread() {

91 WizardInProcessBrowserTest::SetUpOnMainThread();	91 WizardInProcessBrowserTest::SetUpOnMainThread();

92 mock_screen_observer_.reset(new MockScreenObserver());	92 mock_screen_observer_.reset(new MockScreenObserver());

93 ASSERT_TRUE(WizardController::default_controller() != NULL);	93 ASSERT_TRUE(WizardController::default_controller() != NULL);

94 update_screen_ = WizardController::default_controller()->GetUpdateScreen();	94 update_screen_ = WizardController::default_controller()->GetUpdateScreen();

95 ASSERT_TRUE(update_screen_ != NULL);	95 ASSERT_TRUE(update_screen_ != NULL);

96 ASSERT_EQ(WizardController::default_controller()->current_screen(),	96 ASSERT_EQ(WizardController::default_controller()->current_screen(),

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

224 .Times(AtLeast(1))	224 .Times(AtLeast(1))

225 .WillRepeatedly(Return(status));	225 .WillRepeatedly(Return(status));

226 EXPECT_CALL(*mock_screen_observer_,	226 EXPECT_CALL(*mock_screen_observer_,

227 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))	227 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))

228 .Times(1);	228 .Times(1);

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

230 }	230 }

231	231

232 } // namespace chromeos	232 } // namespace chromeos

OLD	NEW