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

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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/login/helper.h" 6 #include "chrome/browser/chromeos/login/helper.h"
7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
8 #include "chrome/browser/chromeos/login/screens/network_screen.h" 8 #include "chrome/browser/chromeos/login/screens/network_screen.h"
9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" 9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
(...skipping 18 matching lines...) Expand all
29 class DummyButtonListener : public views::ButtonListener { 29 class DummyButtonListener : public views::ButtonListener {
30 public: 30 public:
31 virtual void ButtonPressed(views::Button* sender, 31 virtual void ButtonPressed(views::Button* sender,
32 const ui::Event& event) OVERRIDE {} 32 const ui::Event& event) OVERRIDE {}
33 }; 33 };
34 34
35 namespace login { 35 namespace login {
36 36
37 class MockNetworkStateHelper : public NetworkStateHelper { 37 class MockNetworkStateHelper : public NetworkStateHelper {
38 public: 38 public:
39 MOCK_CONST_METHOD0(GetCurrentNetworkName, string16(void)); 39 MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void));
40 MOCK_CONST_METHOD0(IsConnected, bool(void)); 40 MOCK_CONST_METHOD0(IsConnected, bool(void));
41 MOCK_CONST_METHOD0(IsConnecting, bool(void)); 41 MOCK_CONST_METHOD0(IsConnecting, bool(void));
42 }; 42 };
43 43
44 } // namespace login 44 } // namespace login
45 45
46 class NetworkScreenTest : public WizardInProcessBrowserTest { 46 class NetworkScreenTest : public WizardInProcessBrowserTest {
47 public: 47 public:
48 NetworkScreenTest(): WizardInProcessBrowserTest("network"), 48 NetworkScreenTest(): WizardInProcessBrowserTest("network"),
49 fake_session_manager_client_(NULL) { 49 fake_session_manager_client_(NULL) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 .Times(1); 88 .Times(1);
89 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) 89 EXPECT_CALL(*mock_network_state_helper_, IsConnected())
90 .WillOnce(Return(true)); 90 .WillOnce(Return(true));
91 network_screen->OnContinuePressed(); 91 network_screen->OnContinuePressed();
92 content::RunAllPendingInMessageLoop(); 92 content::RunAllPendingInMessageLoop();
93 } 93 }
94 94
95 void SetDefaultNetworkStateHelperExpectations() { 95 void SetDefaultNetworkStateHelperExpectations() {
96 EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName()) 96 EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName())
97 .Times(AnyNumber()) 97 .Times(AnyNumber())
98 .WillRepeatedly((Return(string16()))); 98 .WillRepeatedly((Return(base::string16())));
99 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) 99 EXPECT_CALL(*mock_network_state_helper_, IsConnected())
100 .Times(AnyNumber()) 100 .Times(AnyNumber())
101 .WillRepeatedly((Return(false))); 101 .WillRepeatedly((Return(false)));
102 EXPECT_CALL(*mock_network_state_helper_, IsConnecting()) 102 EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
103 .Times(AnyNumber()) 103 .Times(AnyNumber())
104 .WillRepeatedly((Return(false))); 104 .WillRepeatedly((Return(false)));
105 } 105 }
106 106
107 scoped_ptr<MockScreenObserver> mock_screen_observer_; 107 scoped_ptr<MockScreenObserver> mock_screen_observer_;
108 login::MockNetworkStateHelper* mock_network_state_helper_; 108 login::MockNetworkStateHelper* mock_network_state_helper_;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 // Close infobubble with error message - it makes the test stable. 150 // Close infobubble with error message - it makes the test stable.
151 // EXPECT_FALSE(actor_->IsContinueEnabled()); 151 // EXPECT_FALSE(actor_->IsContinueEnabled());
152 // EXPECT_FALSE(actor_->IsConnecting()); 152 // EXPECT_FALSE(actor_->IsConnecting());
153 // actor_->ClearErrors(); 153 // actor_->ClearErrors();
154 EXPECT_EQ( 154 EXPECT_EQ(
155 1, fake_session_manager_client_->emit_login_prompt_ready_call_count()); 155 1, fake_session_manager_client_->emit_login_prompt_ready_call_count());
156 } 156 }
157 157
158 } // namespace chromeos 158 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen_actor.h ('k') | chrome/browser/chromeos/login/supervised_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698