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

Side by Side Diff: chrome/browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc

Issue 22743002: Convert OneClickSigninBubbleViewTest to browser_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove tabs Created 7 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/views/sync/one_click_signin_bubble_view.h" 5 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h" 11 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h"
12 #include "chrome/browser/ui/views/frame/browser_view.h"
13 #include "chrome/browser/ui/views/toolbar_view.h"
14 #include "chrome/test/base/in_process_browser_test.h"
11 #include "chrome/test/base/ui_test_utils.h" 15 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/public/common/page_transition_types.h" 16 #include "content/public/common/page_transition_types.h"
13 #include "ui/views/controls/button/label_button.h" 17 #include "ui/views/controls/button/label_button.h"
14 #include "ui/views/test/views_test_base.h"
15 #include "ui/views/widget/widget.h"
16 18
17 class OneClickSigninBubbleViewTest : public views::ViewsTestBase { 19 class OneClickSigninBubbleViewTest : public InProcessBrowserTest {
18 public: 20 public:
19 OneClickSigninBubbleViewTest() 21 OneClickSigninBubbleViewTest()
20 : on_start_sync_called_(false), 22 : on_start_sync_called_(false),
21 mode_(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST), 23 mode_(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST),
22 bubble_learn_more_click_count_(0), 24 bubble_learn_more_click_count_(0),
23 dialog_learn_more_click_count_(0), 25 dialog_learn_more_click_count_(0),
24 advanced_click_count_(0), 26 advanced_click_count_(0) {
25 anchor_widget_(NULL) {
26 } 27 }
27 28
28 virtual void SetUp() OVERRIDE { 29 // InProcessBrowserTest:
29 views::ViewsTestBase::SetUp(); 30 virtual void SetUpOnMainThread() OVERRIDE {
30 31 OneClickSigninBubbleView::set_close_on_deactivate_for_testing(false);
31 // Create a widget to host the anchor view.
32 anchor_widget_ = new views::Widget;
33 views::Widget::InitParams widget_params = CreateParams(
34 views::Widget::InitParams::TYPE_WINDOW);
35 anchor_widget_->Init(widget_params);
36 anchor_widget_->Show();
37 }
38
39 virtual void TearDown() OVERRIDE {
40 OneClickSigninBubbleView::Hide();
41 anchor_widget_->Close();
42 anchor_widget_ = NULL;
43 views::ViewsTestBase::TearDown();
44 } 32 }
45 33
46 protected: 34 protected:
47 OneClickSigninBubbleView* ShowOneClickSigninBubble( 35 OneClickSigninBubbleView* ShowOneClickSigninBubble(
48 BrowserWindow::OneClickSigninBubbleType bubble_type) { 36 BrowserWindow::OneClickSigninBubbleType bubble_type) {
49 37
50 scoped_ptr<OneClickSigninBubbleDelegate> delegate; 38 scoped_ptr<OneClickSigninBubbleDelegate> delegate;
51 delegate.reset(new OneClickSigninBubbleTestDelegate(this)); 39 delegate.reset(new OneClickSigninBubbleTestDelegate(this));
52 40
53 OneClickSigninBubbleView::ShowBubble( 41 OneClickSigninBubbleView::ShowBubble(
54 bubble_type, 42 bubble_type,
55 string16(), 43 string16(),
56 string16(), 44 string16(),
57 delegate.Pass(), 45 delegate.Pass(),
58 anchor_widget_->GetContentsView(), 46 static_cast<BrowserView*>(
47 browser()->window())->toolbar()->location_bar(),
59 base::Bind(&OneClickSigninBubbleViewTest::OnStartSync, 48 base::Bind(&OneClickSigninBubbleViewTest::OnStartSync,
60 base::Unretained(this))); 49 base::Unretained(this)));
61 50
62 OneClickSigninBubbleView* view = 51 OneClickSigninBubbleView* view =
63 OneClickSigninBubbleView::view_for_testing(); 52 OneClickSigninBubbleView::view_for_testing();
64 EXPECT_TRUE(view != NULL); 53 EXPECT_TRUE(view != NULL);
65 view->message_loop_for_testing_ = base::MessageLoop::current(); 54 view->message_loop_for_testing_ = base::MessageLoop::current();
66 return view; 55 return view;
67 } 56 }
68 57
(...skipping 28 matching lines...) Expand all
97 virtual void OnAdvancedLinkClicked() OVERRIDE { 86 virtual void OnAdvancedLinkClicked() OVERRIDE {
98 ++test_->advanced_click_count_; 87 ++test_->advanced_click_count_;
99 } 88 }
100 89
101 private: 90 private:
102 OneClickSigninBubbleViewTest* test_; 91 OneClickSigninBubbleViewTest* test_;
103 92
104 DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleTestDelegate); 93 DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleTestDelegate);
105 }; 94 };
106 95
107 // Widget to host the anchor view of the bubble. Destroys itself when closed.
108 views::Widget* anchor_widget_;
109
110 DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleViewTest); 96 DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleViewTest);
111 }; 97 };
112 98
113 TEST_F(OneClickSigninBubbleViewTest, ShowBubble) { 99 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, ShowBubble) {
114 ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 100 ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
115 content::RunAllPendingInMessageLoop(); 101 content::RunAllPendingInMessageLoop();
116 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing()); 102 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
117 } 103 }
118 104
119 TEST_F(OneClickSigninBubbleViewTest, ShowDialog) { 105 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, ShowDialog) {
120 ShowOneClickSigninBubble( 106 ShowOneClickSigninBubble(
121 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 107 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
122 content::RunAllPendingInMessageLoop(); 108 content::RunAllPendingInMessageLoop();
123 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing()); 109 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
124 } 110 }
125 111
126 TEST_F(OneClickSigninBubbleViewTest, HideBubble) { 112 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, HideBubble) {
127 ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 113 ShowOneClickSigninBubble(BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
128 114
129 OneClickSigninBubbleView::Hide(); 115 OneClickSigninBubbleView::Hide();
130 content::RunAllPendingInMessageLoop(); 116 content::RunAllPendingInMessageLoop();
131 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 117 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
132 } 118 }
133 119
134 TEST_F(OneClickSigninBubbleViewTest, HideDialog) { 120 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, HideDialog) {
135 ShowOneClickSigninBubble( 121 ShowOneClickSigninBubble(
136 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 122 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
137 123
138 OneClickSigninBubbleView::Hide(); 124 OneClickSigninBubbleView::Hide();
139 content::RunAllPendingInMessageLoop(); 125 content::RunAllPendingInMessageLoop();
140 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 126 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
141 EXPECT_TRUE(on_start_sync_called_); 127 EXPECT_TRUE(on_start_sync_called_);
142 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_); 128 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
143 } 129 }
144 130
145 TEST_F(OneClickSigninBubbleViewTest, BubbleOkButton) { 131 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleOkButton) {
146 OneClickSigninBubbleView* view = 132 OneClickSigninBubbleView* view =
147 ShowOneClickSigninBubble( 133 ShowOneClickSigninBubble(
148 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 134 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
149 135
150 // Simulate pressing the OK button. Set the message loop in the bubble 136 // Simulate pressing the OK button. Set the message loop in the bubble
151 // view so that it can be quit once the bubble is hidden. 137 // view so that it can be quit once the bubble is hidden.
152 views::ButtonListener* listener = view; 138 views::ButtonListener* listener = view;
153 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, 139 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED,
154 gfx::Point(), gfx::Point(), 140 gfx::Point(), gfx::Point(),
155 0); 141 0);
156 listener->ButtonPressed(view->ok_button_, event); 142 listener->ButtonPressed(view->ok_button_, event);
157 143
158 // View should no longer be showing. The message loop will exit once the 144 // View should no longer be showing. The message loop will exit once the
159 // fade animation of the bubble is done. 145 // fade animation of the bubble is done.
160 content::RunAllPendingInMessageLoop(); 146 content::RunAllPendingInMessageLoop();
161 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 147 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
162 } 148 }
163 149
164 TEST_F(OneClickSigninBubbleViewTest, DialogOkButton) { 150 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogOkButton) {
165 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 151 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
166 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 152 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
167 153
168 // Simulate pressing the OK button. Set the message loop in the bubble 154 // Simulate pressing the OK button. Set the message loop in the bubble
169 // view so that it can be quit once the bubble is hidden. 155 // view so that it can be quit once the bubble is hidden.
170 views::ButtonListener* listener = view; 156 views::ButtonListener* listener = view;
171 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, 157 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED,
172 gfx::Point(), gfx::Point(), 158 gfx::Point(), gfx::Point(),
173 0); 159 0);
174 listener->ButtonPressed(view->ok_button_, event); 160 listener->ButtonPressed(view->ok_button_, event);
175 161
176 // View should no longer be showing and sync should start 162 // View should no longer be showing and sync should start
177 // The message loop will exit once the fade animation of the dialog is done. 163 // The message loop will exit once the fade animation of the dialog is done.
178 content::RunAllPendingInMessageLoop(); 164 content::RunAllPendingInMessageLoop();
179 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 165 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
180 EXPECT_TRUE(on_start_sync_called_); 166 EXPECT_TRUE(on_start_sync_called_);
181 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_); 167 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
182 } 168 }
183 169
184 TEST_F(OneClickSigninBubbleViewTest, DialogUndoButton) { 170 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogUndoButton) {
185 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 171 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
186 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 172 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
187 173
188 // Simulate pressing the undo button. Set the message loop in the bubble 174 // Simulate pressing the undo button. Set the message loop in the bubble
189 // view so that it can be quit once the bubble is hidden. 175 // view so that it can be quit once the bubble is hidden.
190 views::ButtonListener* listener = view; 176 views::ButtonListener* listener = view;
191 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, 177 const ui::MouseEvent event(ui::ET_MOUSE_PRESSED,
192 gfx::Point(), gfx::Point(), 178 gfx::Point(), gfx::Point(),
193 0); 179 0);
194 listener->ButtonPressed(view->undo_button_, event); 180 listener->ButtonPressed(view->undo_button_, event);
195 181
196 // View should no longer be showing. The message loop will exit once the 182 // View should no longer be showing. The message loop will exit once the
197 // fade animation of the bubble is done. 183 // fade animation of the bubble is done.
198 content::RunAllPendingInMessageLoop(); 184 content::RunAllPendingInMessageLoop();
199 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 185 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
200 EXPECT_TRUE(on_start_sync_called_); 186 EXPECT_TRUE(on_start_sync_called_);
201 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); 187 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_);
202 } 188 }
203 189
204 TEST_F(OneClickSigninBubbleViewTest, BubbleAdvancedLink) { 190 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleAdvancedLink) {
205 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 191 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
206 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 192 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
207 193
208 // Simulate pressing a link in the bubble. 194 // Simulate pressing a link in the bubble.
209 views::LinkListener* listener = view; 195 views::LinkListener* listener = view;
210 listener->LinkClicked(view->advanced_link_, 0); 196 listener->LinkClicked(view->advanced_link_, 0);
211 197
212 // View should no longer be showing and the OnAdvancedLinkClicked method 198 // View should no longer be showing and the OnAdvancedLinkClicked method
213 // of the delegate should have been called. 199 // of the delegate should have been called.
214 content::RunAllPendingInMessageLoop(); 200 content::RunAllPendingInMessageLoop();
215 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 201 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
216 EXPECT_EQ(1, advanced_click_count_); 202 EXPECT_EQ(1, advanced_click_count_);
217 } 203 }
218 204
219 TEST_F(OneClickSigninBubbleViewTest, DialogAdvancedLink) { 205 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogAdvancedLink) {
220 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 206 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
221 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 207 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
222 208
223 // Simulate pressing a link in the bubble. 209 // Simulate pressing a link in the bubble.
224 views::LinkListener* listener = view; 210 views::LinkListener* listener = view;
225 listener->LinkClicked(view->advanced_link_, 0); 211 listener->LinkClicked(view->advanced_link_, 0);
226 212
227 // View should no longer be showing. No delegate method should have been 213 // View should no longer be showing. No delegate method should have been
228 // called: the callback is responsible to open the settings page. 214 // called: the callback is responsible to open the settings page.
229 content::RunAllPendingInMessageLoop(); 215 content::RunAllPendingInMessageLoop();
230 EXPECT_TRUE(on_start_sync_called_); 216 EXPECT_TRUE(on_start_sync_called_);
231 EXPECT_EQ(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST, mode_); 217 EXPECT_EQ(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST, mode_);
232 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 218 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
233 EXPECT_EQ(0, advanced_click_count_); 219 EXPECT_EQ(0, advanced_click_count_);
234 } 220 }
235 221
236 TEST_F(OneClickSigninBubbleViewTest, BubbleLearnMoreLink) { 222 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubbleLearnMoreLink) {
237 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 223 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
238 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 224 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
239 225
240 views::LinkListener* listener = view; 226 views::LinkListener* listener = view;
241 listener->LinkClicked(view->learn_more_link_, 0); 227 listener->LinkClicked(view->learn_more_link_, 0);
242 228
243 // View should no longer be showing and the OnLearnMoreLinkClicked method 229 // View should no longer be showing and the OnLearnMoreLinkClicked method
244 // of the delegate should have been called with |is_dialog| == false. 230 // of the delegate should have been called with |is_dialog| == false.
245 content::RunAllPendingInMessageLoop(); 231 content::RunAllPendingInMessageLoop();
246 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 232 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
247 EXPECT_EQ(1, bubble_learn_more_click_count_); 233 EXPECT_EQ(1, bubble_learn_more_click_count_);
248 EXPECT_EQ(0, dialog_learn_more_click_count_); 234 EXPECT_EQ(0, dialog_learn_more_click_count_);
249 } 235 }
250 236
251 TEST_F(OneClickSigninBubbleViewTest, DialogLearnMoreLink) { 237 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogLearnMoreLink) {
252 OneClickSigninBubbleView* view = ShowOneClickSigninBubble( 238 OneClickSigninBubbleView* view = ShowOneClickSigninBubble(
253 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 239 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
254 240
255 views::LinkListener* listener = view; 241 views::LinkListener* listener = view;
256 listener->LinkClicked(view->learn_more_link_, 0); 242 listener->LinkClicked(view->learn_more_link_, 0);
257 243
258 // View should still be showing and the OnLearnMoreLinkClicked method 244 // View should still be showing and the OnLearnMoreLinkClicked method
259 // of the delegate should have been called with |is_dialog| == true. 245 // of the delegate should have been called with |is_dialog| == true.
260 content::RunAllPendingInMessageLoop(); 246 content::RunAllPendingInMessageLoop();
261 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing()); 247 EXPECT_TRUE(OneClickSigninBubbleView::IsShowing());
262 EXPECT_EQ(0, bubble_learn_more_click_count_); 248 EXPECT_EQ(0, bubble_learn_more_click_count_);
263 EXPECT_EQ(1, dialog_learn_more_click_count_); 249 EXPECT_EQ(1, dialog_learn_more_click_count_);
264 } 250 }
265 251
266 TEST_F(OneClickSigninBubbleViewTest, BubblePressEnterKey) { 252 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubblePressEnterKey) {
267 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble( 253 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
268 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 254 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
269 255
270 // Simulate pressing the Enter key. 256 // Simulate pressing the Enter key.
271 views::View* view = one_click_view; 257 views::View* view = one_click_view;
272 const ui::Accelerator accelerator(ui::VKEY_RETURN, 0); 258 const ui::Accelerator accelerator(ui::VKEY_RETURN, 0);
273 view->AcceleratorPressed(accelerator); 259 view->AcceleratorPressed(accelerator);
274 260
275 // View should no longer be showing. The message loop will exit once the 261 // View should no longer be showing. The message loop will exit once the
276 // fade animation of the bubble is done. 262 // fade animation of the bubble is done.
277 content::RunAllPendingInMessageLoop(); 263 content::RunAllPendingInMessageLoop();
278 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 264 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
279 } 265 }
280 266
281 TEST_F(OneClickSigninBubbleViewTest, DialogPressEnterKey) { 267 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogPressEnterKey) {
282 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble( 268 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
283 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 269 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
284 270
285 // Simulate pressing the Enter key. 271 // Simulate pressing the Enter key.
286 views::View* view = one_click_view; 272 views::View* view = one_click_view;
287 const ui::Accelerator accelerator(ui::VKEY_RETURN, 0); 273 const ui::Accelerator accelerator(ui::VKEY_RETURN, 0);
288 view->AcceleratorPressed(accelerator); 274 view->AcceleratorPressed(accelerator);
289 275
290 // View should no longer be showing. The message loop will exit once the 276 // View should no longer be showing. The message loop will exit once the
291 // fade animation of the bubble is done. 277 // fade animation of the bubble is done.
292 content::RunAllPendingInMessageLoop(); 278 content::RunAllPendingInMessageLoop();
293 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 279 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
294 EXPECT_TRUE(on_start_sync_called_); 280 EXPECT_TRUE(on_start_sync_called_);
295 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_); 281 EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, mode_);
296 } 282 }
297 283
298 TEST_F(OneClickSigninBubbleViewTest, BubblePressEscapeKey) { 284 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, BubblePressEscapeKey) {
299 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble( 285 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
300 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE); 286 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE);
301 287
302 // Simulate pressing the Escape key. 288 // Simulate pressing the Escape key.
303 views::View* view = one_click_view; 289 views::View* view = one_click_view;
304 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0); 290 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0);
305 view->AcceleratorPressed(accelerator); 291 view->AcceleratorPressed(accelerator);
306 292
307 // View should no longer be showing. The message loop will exit once the 293 // View should no longer be showing. The message loop will exit once the
308 // fade animation of the bubble is done. 294 // fade animation of the bubble is done.
309 content::RunAllPendingInMessageLoop(); 295 content::RunAllPendingInMessageLoop();
310 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 296 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
311 } 297 }
312 298
313 TEST_F(OneClickSigninBubbleViewTest, DialogPressEscapeKey) { 299 IN_PROC_BROWSER_TEST_F(OneClickSigninBubbleViewTest, DialogPressEscapeKey) {
314 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble( 300 OneClickSigninBubbleView* one_click_view = ShowOneClickSigninBubble(
315 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG); 301 BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG);
316 302
317 // Simulate pressing the Escape key. 303 // Simulate pressing the Escape key.
318 views::View* view = one_click_view; 304 views::View* view = one_click_view;
319 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0); 305 const ui::Accelerator accelerator(ui::VKEY_ESCAPE, 0);
320 view->AcceleratorPressed(accelerator); 306 view->AcceleratorPressed(accelerator);
321 307
322 // View should no longer be showing. The message loop will exit once the 308 // View should no longer be showing. The message loop will exit once the
323 // fade animation of the bubble is done. 309 // fade animation of the bubble is done.
324 content::RunAllPendingInMessageLoop(); 310 content::RunAllPendingInMessageLoop();
325 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing()); 311 EXPECT_FALSE(OneClickSigninBubbleView::IsShowing());
326 EXPECT_TRUE(on_start_sync_called_); 312 EXPECT_TRUE(on_start_sync_called_);
327 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_); 313 EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, mode_);
328 } 314 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698