OLD | NEW |
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/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/ssl/ssl_client_auth_requestor_mock.h" | 9 #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 | 307 |
308 Mock::VerifyAndClear(auth_requestor_.get()); | 308 Mock::VerifyAndClear(auth_requestor_.get()); |
309 Mock::VerifyAndClear(auth_requestor_1_.get()); | 309 Mock::VerifyAndClear(auth_requestor_1_.get()); |
310 Mock::VerifyAndClear(auth_requestor_2_.get()); | 310 Mock::VerifyAndClear(auth_requestor_2_.get()); |
311 | 311 |
312 // Now let the default selection for auth_requestor_ mock get checked on | 312 // Now let the default selection for auth_requestor_ mock get checked on |
313 // destruction. | 313 // destruction. |
314 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 314 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
315 } | 315 } |
316 | 316 |
317 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, SelectSecond) { | 317 // http://crbug.com/121007 |
| 318 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorMultiTabTest, |
| 319 DISABLED_SelectSecond) { |
318 // auth_requestor_1_ should get selected automatically by the | 320 // auth_requestor_1_ should get selected automatically by the |
319 // SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have | 321 // SSLClientAuthObserver when selector_2_ is accepted, since both 1 & 2 have |
320 // the same host:port. | 322 // the same host:port. |
321 EXPECT_CALL(*auth_requestor_1_, | 323 EXPECT_CALL(*auth_requestor_1_, |
322 CertificateSelected(foaf_me_chromium_test_cert_.get())); | 324 CertificateSelected(foaf_me_chromium_test_cert_.get())); |
323 EXPECT_CALL(*auth_requestor_2_, | 325 EXPECT_CALL(*auth_requestor_2_, |
324 CertificateSelected(foaf_me_chromium_test_cert_.get())); | 326 CertificateSelected(foaf_me_chromium_test_cert_.get())); |
325 | 327 |
326 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 328 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
327 browser(), ui::VKEY_DOWN, false, false, false, false)); | 329 browser(), ui::VKEY_DOWN, false, false, false, false)); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 369 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
368 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 370 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
369 | 371 |
370 Mock::VerifyAndClear(auth_requestor_.get()); | 372 Mock::VerifyAndClear(auth_requestor_.get()); |
371 Mock::VerifyAndClear(auth_requestor_1_.get()); | 373 Mock::VerifyAndClear(auth_requestor_1_.get()); |
372 | 374 |
373 // Now let the default selection for auth_requestor_ mock get checked on | 375 // Now let the default selection for auth_requestor_ mock get checked on |
374 // destruction. | 376 // destruction. |
375 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 377 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
376 } | 378 } |
OLD | NEW |