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/files/file_path.h" | 6 #include "base/files/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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 | 267 |
268 protected: | 268 protected: |
269 Browser* browser_1_; | 269 Browser* browser_1_; |
270 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_1_; | 270 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_1_; |
271 net::URLRequest* url_request_1_; | 271 net::URLRequest* url_request_1_; |
272 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_1_; | 272 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_1_; |
273 scoped_refptr<StrictMock<SSLClientAuthRequestorMock> > auth_requestor_1_; | 273 scoped_refptr<StrictMock<SSLClientAuthRequestorMock> > auth_requestor_1_; |
274 SSLClientCertificateSelector* selector_1_; | 274 SSLClientCertificateSelector* selector_1_; |
275 }; | 275 }; |
276 | 276 |
277 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, SelectNone) { | 277 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 278 // TODO(erg): linux_aura bringup: http://crbug.com/163931 |
| 279 #define MAYBE_SelectNone DISABLED_SelectNone |
| 280 #else |
| 281 #define MAYBE_SelectNone SelectNone |
| 282 #endif |
| 283 |
| 284 |
| 285 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, MAYBE_SelectNone) { |
278 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 286 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
279 | 287 |
280 // Let the mock get checked on destruction. | 288 // Let the mock get checked on destruction. |
281 } | 289 } |
282 | 290 |
283 // http://crbug.com/121007 | 291 // http://crbug.com/121007 |
284 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, DISABLED_Escape) { | 292 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorTest, DISABLED_Escape) { |
285 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 293 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
286 | 294 |
287 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 295 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( | 385 EXPECT_TRUE(ui_test_utils::SendKeyPressSync( |
378 browser_1_, ui::VKEY_RETURN, false, false, false, false)); | 386 browser_1_, ui::VKEY_RETURN, false, false, false, false)); |
379 | 387 |
380 Mock::VerifyAndClear(auth_requestor_.get()); | 388 Mock::VerifyAndClear(auth_requestor_.get()); |
381 Mock::VerifyAndClear(auth_requestor_1_.get()); | 389 Mock::VerifyAndClear(auth_requestor_1_.get()); |
382 | 390 |
383 // Now let the default selection for auth_requestor_ mock get checked on | 391 // Now let the default selection for auth_requestor_ mock get checked on |
384 // destruction. | 392 // destruction. |
385 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); | 393 EXPECT_CALL(*auth_requestor_, CertificateSelected(NULL)); |
386 } | 394 } |
OLD | NEW |