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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
(...skipping 27 matching lines...) Expand all
38 } // namespace 38 } // namespace
39 39
40 class UpdateScreenTest : public WizardInProcessBrowserTest { 40 class UpdateScreenTest : public WizardInProcessBrowserTest {
41 public: 41 public:
42 UpdateScreenTest() : WizardInProcessBrowserTest("update"), 42 UpdateScreenTest() : WizardInProcessBrowserTest("update"),
43 fake_update_engine_client_(NULL), 43 fake_update_engine_client_(NULL),
44 network_portal_detector_(NULL) { 44 network_portal_detector_(NULL) {
45 } 45 }
46 46
47 protected: 47 protected:
48 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 48 virtual void SetUpInProcessBrowserTestFixture() override {
49 fake_update_engine_client_ = new FakeUpdateEngineClient; 49 fake_update_engine_client_ = new FakeUpdateEngineClient;
50 chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient( 50 chromeos::DBusThreadManager::GetSetterForTesting()->SetUpdateEngineClient(
51 scoped_ptr<UpdateEngineClient>(fake_update_engine_client_)); 51 scoped_ptr<UpdateEngineClient>(fake_update_engine_client_));
52 52
53 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); 53 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
54 54
55 // Setup network portal detector to return online state for both 55 // Setup network portal detector to return online state for both
56 // ethernet and wifi networks. Ethernet is an active network by 56 // ethernet and wifi networks. Ethernet is an active network by
57 // default. 57 // default.
58 network_portal_detector_ = new NetworkPortalDetectorTestImpl(); 58 network_portal_detector_ = new NetworkPortalDetectorTestImpl();
59 NetworkPortalDetector::InitializeForTesting(network_portal_detector_); 59 NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
60 NetworkPortalDetector::CaptivePortalState online_state; 60 NetworkPortalDetector::CaptivePortalState online_state;
61 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; 61 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
62 online_state.response_code = 204; 62 online_state.response_code = 204;
63 SetDefaultNetwork(kStubEthernetGuid); 63 SetDefaultNetwork(kStubEthernetGuid);
64 SetDetectionResults(kStubEthernetGuid, online_state); 64 SetDetectionResults(kStubEthernetGuid, online_state);
65 SetDetectionResults(kStubWifiGuid, online_state); 65 SetDetectionResults(kStubWifiGuid, online_state);
66 } 66 }
67 67
68 virtual void SetUpOnMainThread() OVERRIDE { 68 virtual void SetUpOnMainThread() override {
69 WizardInProcessBrowserTest::SetUpOnMainThread(); 69 WizardInProcessBrowserTest::SetUpOnMainThread();
70 70
71 mock_screen_observer_.reset(new MockScreenObserver()); 71 mock_screen_observer_.reset(new MockScreenObserver());
72 mock_error_screen_actor_.reset(new MockErrorScreenActor()); 72 mock_error_screen_actor_.reset(new MockErrorScreenActor());
73 mock_error_screen_.reset( 73 mock_error_screen_.reset(
74 new MockErrorScreen(mock_screen_observer_.get(), 74 new MockErrorScreen(mock_screen_observer_.get(),
75 mock_error_screen_actor_.get())); 75 mock_error_screen_actor_.get()));
76 EXPECT_CALL(*mock_screen_observer_, ShowCurrentScreen()) 76 EXPECT_CALL(*mock_screen_observer_, ShowCurrentScreen())
77 .Times(AnyNumber()); 77 .Times(AnyNumber());
78 EXPECT_CALL(*mock_screen_observer_, GetErrorScreen()) 78 EXPECT_CALL(*mock_screen_observer_, GetErrorScreen())
79 .Times(AnyNumber()) 79 .Times(AnyNumber())
80 .WillRepeatedly(Return(mock_error_screen_.get())); 80 .WillRepeatedly(Return(mock_error_screen_.get()));
81 81
82 ASSERT_TRUE(WizardController::default_controller() != NULL); 82 ASSERT_TRUE(WizardController::default_controller() != NULL);
83 update_screen_ = UpdateScreen::Get(WizardController::default_controller()); 83 update_screen_ = UpdateScreen::Get(WizardController::default_controller());
84 ASSERT_TRUE(update_screen_ != NULL); 84 ASSERT_TRUE(update_screen_ != NULL);
85 ASSERT_EQ(WizardController::default_controller()->current_screen(), 85 ASSERT_EQ(WizardController::default_controller()->current_screen(),
86 update_screen_); 86 update_screen_);
87 update_screen_->screen_observer_ = mock_screen_observer_.get(); 87 update_screen_->screen_observer_ = mock_screen_observer_.get();
88 } 88 }
89 89
90 virtual void TearDownOnMainThread() OVERRIDE { 90 virtual void TearDownOnMainThread() override {
91 mock_error_screen_.reset(); 91 mock_error_screen_.reset();
92 mock_error_screen_actor_.reset(); 92 mock_error_screen_actor_.reset();
93 WizardInProcessBrowserTest::TearDownOnMainThread(); 93 WizardInProcessBrowserTest::TearDownOnMainThread();
94 } 94 }
95 95
96 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 96 virtual void TearDownInProcessBrowserTestFixture() override {
97 NetworkPortalDetector::Shutdown(); 97 NetworkPortalDetector::Shutdown();
98 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); 98 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
99 } 99 }
100 100
101 void SetDefaultNetwork(const std::string& guid) { 101 void SetDefaultNetwork(const std::string& guid) {
102 DCHECK(network_portal_detector_); 102 DCHECK(network_portal_detector_);
103 network_portal_detector_->SetDefaultNetworkForTesting(guid); 103 network_portal_detector_->SetDefaultNetworkForTesting(guid);
104 } 104 }
105 105
106 void SetDetectionResults( 106 void SetDetectionResults(
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); 392 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
393 EXPECT_CALL(*mock_screen_observer_, 393 EXPECT_CALL(*mock_screen_observer_,
394 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) 394 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
395 .Times(1); 395 .Times(1);
396 396
397 update_screen_->OnConnectToNetworkRequested(); 397 update_screen_->OnConnectToNetworkRequested();
398 base::MessageLoop::current()->RunUntilIdle(); 398 base::MessageLoop::current()->RunUntilIdle();
399 } 399 }
400 400
401 } // namespace chromeos 401 } // namespace chromeos
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698