Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

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

Issue 14192017: Extract certificate policy application from NetworkLibrary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 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
OLDNEW
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/cros_library.h" 6 #include "chrome/browser/chromeos/cros/cros_library.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/cros/network_library.h" 8 #include "chrome/browser/chromeos/cros/network_library.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/network_screen.h" 10 #include "chrome/browser/chromeos/login/screens/network_screen.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) 70 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
71 .Times(AnyNumber()); 71 .Times(AnyNumber());
72 EXPECT_CALL(*mock_connectivity_state_helper_, 72 EXPECT_CALL(*mock_connectivity_state_helper_,
73 IsConnectedType(flimflam::kTypeWifi)) 73 IsConnectedType(flimflam::kTypeWifi))
74 .Times(1) 74 .Times(1)
75 .WillRepeatedly(Return(false)); 75 .WillRepeatedly(Return(false));
76 EXPECT_CALL(*mock_network_library_, FindWifiDevice()) 76 EXPECT_CALL(*mock_network_library_, FindWifiDevice())
77 .Times(AnyNumber()); 77 .Times(AnyNumber());
78 EXPECT_CALL(*mock_network_library_, FindEthernetDevice()) 78 EXPECT_CALL(*mock_network_library_, FindEthernetDevice())
79 .Times(AnyNumber()); 79 .Times(AnyNumber());
80 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _)) 80 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
81 .WillRepeatedly(Return(true)); 81 .Times(AnyNumber());
82 82
83 cros_mock_->SetStatusAreaMocksExpectations(); 83 cros_mock_->SetStatusAreaMocksExpectations();
84 } 84 }
85 85
86 virtual void SetUpOnMainThread() OVERRIDE { 86 virtual void SetUpOnMainThread() OVERRIDE {
87 WizardInProcessBrowserTest::SetUpOnMainThread(); 87 WizardInProcessBrowserTest::SetUpOnMainThread();
88 mock_screen_observer_.reset(new MockScreenObserver()); 88 mock_screen_observer_.reset(new MockScreenObserver());
89 ASSERT_TRUE(WizardController::default_controller() != NULL); 89 ASSERT_TRUE(WizardController::default_controller() != NULL);
90 network_screen_ = 90 network_screen_ =
91 WizardController::default_controller()->GetNetworkScreen(); 91 WizardController::default_controller()->GetNetworkScreen();
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 // EXPECT_FALSE(actor_->IsConnecting()); 287 // EXPECT_FALSE(actor_->IsConnecting());
288 network_screen_->OnConnectionTimeout(); 288 network_screen_->OnConnectionTimeout();
289 289
290 // Close infobubble with error message - it makes the test stable. 290 // Close infobubble with error message - it makes the test stable.
291 // EXPECT_FALSE(actor_->IsContinueEnabled()); 291 // EXPECT_FALSE(actor_->IsContinueEnabled());
292 // EXPECT_FALSE(actor_->IsConnecting()); 292 // EXPECT_FALSE(actor_->IsConnecting());
293 // actor_->ClearErrors(); 293 // actor_->ClearErrors();
294 } 294 }
295 295
296 } // namespace chromeos 296 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698