| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
| 7 #include "base/synchronization/waitable_event.h" | 7 #include "base/synchronization/waitable_event.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" | 10 #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 | 265 |
| 266 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) { | 266 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, Escape) { |
| 267 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); | 267 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); |
| 268 | 268 |
| 269 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 269 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
| 270 browser(), ui::VKEY_ESCAPE, false, false, false, false)); | 270 browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
| 271 | 271 |
| 272 Mock::VerifyAndClear(auth_handler_); | 272 Mock::VerifyAndClear(auth_handler_); |
| 273 } | 273 } |
| 274 | 274 |
| 275 // http://crbug.com/103534 | 275 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectDefault) { |
| 276 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, FLAKY_SelectDefault) { | |
| 277 EXPECT_CALL(*auth_handler_, | 276 EXPECT_CALL(*auth_handler_, |
| 278 CertificateSelectedNoNotify(mit_davidben_cert_.get())); | 277 CertificateSelectedNoNotify(mit_davidben_cert_.get())); |
| 279 | 278 |
| 280 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 279 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
| 281 browser(), ui::VKEY_RETURN, false, false, false, false)); | 280 browser(), ui::VKEY_RETURN, false, false, false, false)); |
| 282 | 281 |
| 283 Mock::VerifyAndClear(auth_handler_); | 282 Mock::VerifyAndClear(auth_handler_); |
| 284 } | 283 } |
| 285 | 284 |
| 286 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, Escape) { | 285 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, Escape) { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 browser_1_, ui::VKEY_ESCAPE, false, false, false, false)); | 338 browser_1_, ui::VKEY_ESCAPE, false, false, false, false)); |
| 340 | 339 |
| 341 Mock::VerifyAndClear(auth_handler_); | 340 Mock::VerifyAndClear(auth_handler_); |
| 342 Mock::VerifyAndClear(auth_handler_1_); | 341 Mock::VerifyAndClear(auth_handler_1_); |
| 343 | 342 |
| 344 // Now let the default selection for auth_handler_ mock get checked on | 343 // Now let the default selection for auth_handler_ mock get checked on |
| 345 // destruction. | 344 // destruction. |
| 346 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); | 345 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); |
| 347 } | 346 } |
| 348 | 347 |
| 348 // http://crbug.com/103534 |
| 349 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, | 349 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiProfileTest, |
| 350 SelectDefault) { | 350 FLAKY_SelectDefault) { |
| 351 EXPECT_CALL(*auth_handler_1_, | 351 EXPECT_CALL(*auth_handler_1_, |
| 352 CertificateSelectedNoNotify(mit_davidben_cert_.get())); | 352 CertificateSelectedNoNotify(mit_davidben_cert_.get())); |
| 353 | 353 |
| 354 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 354 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
| 355 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 355 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
| 356 | 356 |
| 357 Mock::VerifyAndClear(auth_handler_); | 357 Mock::VerifyAndClear(auth_handler_); |
| 358 Mock::VerifyAndClear(auth_handler_1_); | 358 Mock::VerifyAndClear(auth_handler_1_); |
| 359 | 359 |
| 360 // Now let the default selection for auth_handler_ mock get checked on | 360 // Now let the default selection for auth_handler_ mock get checked on |
| 361 // destruction. | 361 // destruction. |
| 362 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); | 362 EXPECT_CALL(*auth_handler_, CertificateSelectedNoNotify(NULL)); |
| 363 } | 363 } |
| OLD | NEW |