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 "chrome/browser/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 | 72 |
73 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness { | 73 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness { |
74 public: | 74 public: |
75 WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {} | 75 WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {} |
76 | 76 |
77 ~WebsiteSettingsTest() override {} | 77 ~WebsiteSettingsTest() override {} |
78 | 78 |
79 void SetUp() override { | 79 void SetUp() override { |
80 ChromeRenderViewHostTestHarness::SetUp(); | 80 ChromeRenderViewHostTestHarness::SetUp(); |
81 // Setup stub SSLStatus. | 81 // Setup stub SSLStatus. |
82 security_info_.security_level = SecurityStateModel::NONE; | 82 security_info_.security_level = security_state::NONE; |
83 | 83 |
84 // Create the certificate. | 84 // Create the certificate. |
85 cert_id_ = 1; | 85 cert_id_ = 1; |
86 base::Time start_date = base::Time::Now(); | 86 base::Time start_date = base::Time::Now(); |
87 base::Time expiration_date = base::Time::FromInternalValue( | 87 base::Time expiration_date = base::Time::FromInternalValue( |
88 start_date.ToInternalValue() + base::Time::kMicrosecondsPerWeek); | 88 start_date.ToInternalValue() + base::Time::kMicrosecondsPerWeek); |
89 cert_ = new net::X509Certificate("subject", | 89 cert_ = new net::X509Certificate("subject", |
90 "issuer", | 90 "issuer", |
91 start_date, | 91 start_date, |
92 expiration_date); | 92 expiration_date); |
(...skipping 23 matching lines...) Expand all Loading... |
116 EXPECT_CALL(*mock_ui, SetIdentityInfo(_)); | 116 EXPECT_CALL(*mock_ui, SetIdentityInfo(_)); |
117 EXPECT_CALL(*mock_ui, SetCookieInfo(_)); | 117 EXPECT_CALL(*mock_ui, SetCookieInfo(_)); |
118 } | 118 } |
119 | 119 |
120 void SetURL(const std::string& url) { url_ = GURL(url); } | 120 void SetURL(const std::string& url) { url_ = GURL(url); } |
121 | 121 |
122 const GURL& url() const { return url_; } | 122 const GURL& url() const { return url_; } |
123 MockCertStore* cert_store() { return &cert_store_; } | 123 MockCertStore* cert_store() { return &cert_store_; } |
124 int cert_id() { return cert_id_; } | 124 int cert_id() { return cert_id_; } |
125 MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); } | 125 MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); } |
126 const SecurityStateModel::SecurityInfo& security_info() { | 126 const security_state::SecurityInfo& security_info() { return security_info_; } |
127 return security_info_; | |
128 } | |
129 TabSpecificContentSettings* tab_specific_content_settings() { | 127 TabSpecificContentSettings* tab_specific_content_settings() { |
130 return TabSpecificContentSettings::FromWebContents(web_contents()); | 128 return TabSpecificContentSettings::FromWebContents(web_contents()); |
131 } | 129 } |
132 InfoBarService* infobar_service() { | 130 InfoBarService* infobar_service() { |
133 return InfoBarService::FromWebContents(web_contents()); | 131 return InfoBarService::FromWebContents(web_contents()); |
134 } | 132 } |
135 | 133 |
136 WebsiteSettings* website_settings() { | 134 WebsiteSettings* website_settings() { |
137 if (!website_settings_.get()) { | 135 if (!website_settings_.get()) { |
138 website_settings_.reset(new WebsiteSettings( | 136 website_settings_.reset(new WebsiteSettings( |
139 mock_ui(), profile(), tab_specific_content_settings(), web_contents(), | 137 mock_ui(), profile(), tab_specific_content_settings(), web_contents(), |
140 url(), security_info(), cert_store())); | 138 url(), security_info(), cert_store())); |
141 } | 139 } |
142 return website_settings_.get(); | 140 return website_settings_.get(); |
143 } | 141 } |
144 | 142 |
145 SecurityStateModel::SecurityInfo security_info_; | 143 security_state::SecurityInfo security_info_; |
146 | 144 |
147 private: | 145 private: |
148 scoped_ptr<WebsiteSettings> website_settings_; | 146 scoped_ptr<WebsiteSettings> website_settings_; |
149 scoped_ptr<MockWebsiteSettingsUI> mock_ui_; | 147 scoped_ptr<MockWebsiteSettingsUI> mock_ui_; |
150 int cert_id_; | 148 int cert_id_; |
151 scoped_refptr<net::X509Certificate> cert_; | 149 scoped_refptr<net::X509Certificate> cert_; |
152 MockCertStore cert_store_; | 150 MockCertStore cert_store_; |
153 GURL url_; | 151 GURL url_; |
154 }; | 152 }; |
155 | 153 |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 EXPECT_CALL(*mock_ui(), SetSelectedTab( | 279 EXPECT_CALL(*mock_ui(), SetSelectedTab( |
282 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); | 280 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
283 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED, | 281 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED, |
284 website_settings()->site_connection_status()); | 282 website_settings()->site_connection_status()); |
285 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT, | 283 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT, |
286 website_settings()->site_identity_status()); | 284 website_settings()->site_identity_status()); |
287 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 285 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
288 } | 286 } |
289 | 287 |
290 TEST_F(WebsiteSettingsTest, HTTPSConnection) { | 288 TEST_F(WebsiteSettingsTest, HTTPSConnection) { |
291 security_info_.security_level = SecurityStateModel::SECURE; | 289 security_info_.security_level = security_state::SECURE; |
292 security_info_.scheme_is_cryptographic = true; | 290 security_info_.scheme_is_cryptographic = true; |
293 security_info_.cert_id = cert_id(); | 291 security_info_.cert_id = cert_id(); |
294 security_info_.cert_status = 0; | 292 security_info_.cert_status = 0; |
295 security_info_.security_bits = 81; // No error if > 80. | 293 security_info_.security_bits = 81; // No error if > 80. |
296 int status = 0; | 294 int status = 0; |
297 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 295 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
298 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 296 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
299 security_info_.connection_status = status; | 297 security_info_.connection_status = status; |
300 | 298 |
301 SetDefaultUIExpectations(mock_ui()); | 299 SetDefaultUIExpectations(mock_ui()); |
302 EXPECT_CALL(*mock_ui(), SetSelectedTab( | 300 EXPECT_CALL(*mock_ui(), SetSelectedTab( |
303 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); | 301 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
304 | 302 |
305 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 303 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
306 website_settings()->site_connection_status()); | 304 website_settings()->site_connection_status()); |
307 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, | 305 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, |
308 website_settings()->site_identity_status()); | 306 website_settings()->site_identity_status()); |
309 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 307 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
310 } | 308 } |
311 | 309 |
312 TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) { | 310 TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) { |
313 security_info_.security_level = SecurityStateModel::NONE; | 311 security_info_.security_level = security_state::NONE; |
314 security_info_.scheme_is_cryptographic = true; | 312 security_info_.scheme_is_cryptographic = true; |
315 security_info_.cert_id = cert_id(); | 313 security_info_.cert_id = cert_id(); |
316 security_info_.cert_status = 0; | 314 security_info_.cert_status = 0; |
317 security_info_.security_bits = 81; // No error if > 80. | 315 security_info_.security_bits = 81; // No error if > 80. |
318 security_info_.mixed_content_status = | 316 security_info_.mixed_content_status = security_state::DISPLAYED_MIXED_CONTENT; |
319 SecurityStateModel::DISPLAYED_MIXED_CONTENT; | |
320 int status = 0; | 317 int status = 0; |
321 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 318 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
322 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 319 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
323 security_info_.connection_status = status; | 320 security_info_.connection_status = status; |
324 | 321 |
325 SetDefaultUIExpectations(mock_ui()); | 322 SetDefaultUIExpectations(mock_ui()); |
326 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 323 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
327 | 324 |
328 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT, | 325 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT, |
329 website_settings()->site_connection_status()); | 326 website_settings()->site_connection_status()); |
330 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, | 327 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, |
331 website_settings()->site_identity_status()); | 328 website_settings()->site_identity_status()); |
332 EXPECT_EQ(IDR_PAGEINFO_WARNING_MINOR, | 329 EXPECT_EQ(IDR_PAGEINFO_WARNING_MINOR, |
333 WebsiteSettingsUI::GetConnectionIconID( | 330 WebsiteSettingsUI::GetConnectionIconID( |
334 website_settings()->site_connection_status())); | 331 website_settings()->site_connection_status())); |
335 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 332 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
336 } | 333 } |
337 | 334 |
338 TEST_F(WebsiteSettingsTest, HTTPSActiveMixedContent) { | 335 TEST_F(WebsiteSettingsTest, HTTPSActiveMixedContent) { |
339 security_info_.security_level = SecurityStateModel::SECURITY_ERROR; | 336 security_info_.security_level = security_state::SECURITY_ERROR; |
340 security_info_.scheme_is_cryptographic = true; | 337 security_info_.scheme_is_cryptographic = true; |
341 security_info_.cert_id = cert_id(); | 338 security_info_.cert_id = cert_id(); |
342 security_info_.cert_status = 0; | 339 security_info_.cert_status = 0; |
343 security_info_.security_bits = 81; // No error if > 80. | 340 security_info_.security_bits = 81; // No error if > 80. |
344 security_info_.mixed_content_status = | 341 security_info_.mixed_content_status = |
345 SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT; | 342 security_state::RAN_AND_DISPLAYED_MIXED_CONTENT; |
346 int status = 0; | 343 int status = 0; |
347 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 344 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
348 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 345 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
349 security_info_.connection_status = status; | 346 security_info_.connection_status = status; |
350 | 347 |
351 SetDefaultUIExpectations(mock_ui()); | 348 SetDefaultUIExpectations(mock_ui()); |
352 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 349 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
353 | 350 |
354 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT, | 351 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_SCRIPT, |
355 website_settings()->site_connection_status()); | 352 website_settings()->site_connection_status()); |
356 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, | 353 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, |
357 website_settings()->site_identity_status()); | 354 website_settings()->site_identity_status()); |
358 EXPECT_EQ(IDR_PAGEINFO_BAD, | 355 EXPECT_EQ(IDR_PAGEINFO_BAD, |
359 WebsiteSettingsUI::GetConnectionIconID( | 356 WebsiteSettingsUI::GetConnectionIconID( |
360 website_settings()->site_connection_status())); | 357 website_settings()->site_connection_status())); |
361 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 358 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
362 } | 359 } |
363 | 360 |
364 TEST_F(WebsiteSettingsTest, HTTPSEVCert) { | 361 TEST_F(WebsiteSettingsTest, HTTPSEVCert) { |
365 scoped_refptr<net::X509Certificate> ev_cert = | 362 scoped_refptr<net::X509Certificate> ev_cert = |
366 net::X509Certificate::CreateFromBytes( | 363 net::X509Certificate::CreateFromBytes( |
367 reinterpret_cast<const char*>(google_der), | 364 reinterpret_cast<const char*>(google_der), |
368 sizeof(google_der)); | 365 sizeof(google_der)); |
369 int ev_cert_id = 1; | 366 int ev_cert_id = 1; |
370 EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)).WillRepeatedly( | 367 EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)).WillRepeatedly( |
371 DoAll(SetArgPointee<1>(ev_cert), Return(true))); | 368 DoAll(SetArgPointee<1>(ev_cert), Return(true))); |
372 | 369 |
373 security_info_.security_level = SecurityStateModel::NONE; | 370 security_info_.security_level = security_state::NONE; |
374 security_info_.scheme_is_cryptographic = true; | 371 security_info_.scheme_is_cryptographic = true; |
375 security_info_.cert_id = ev_cert_id; | 372 security_info_.cert_id = ev_cert_id; |
376 security_info_.cert_status = net::CERT_STATUS_IS_EV; | 373 security_info_.cert_status = net::CERT_STATUS_IS_EV; |
377 security_info_.security_bits = 81; // No error if > 80. | 374 security_info_.security_bits = 81; // No error if > 80. |
378 security_info_.mixed_content_status = | 375 security_info_.mixed_content_status = security_state::DISPLAYED_MIXED_CONTENT; |
379 SecurityStateModel::DISPLAYED_MIXED_CONTENT; | |
380 int status = 0; | 376 int status = 0; |
381 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 377 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
382 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 378 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
383 security_info_.connection_status = status; | 379 security_info_.connection_status = status; |
384 | 380 |
385 SetDefaultUIExpectations(mock_ui()); | 381 SetDefaultUIExpectations(mock_ui()); |
386 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 382 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
387 | 383 |
388 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT, | 384 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT, |
389 website_settings()->site_connection_status()); | 385 website_settings()->site_connection_status()); |
390 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT, | 386 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT, |
391 website_settings()->site_identity_status()); | 387 website_settings()->site_identity_status()); |
392 EXPECT_EQ(base::UTF8ToUTF16("Google Inc"), | 388 EXPECT_EQ(base::UTF8ToUTF16("Google Inc"), |
393 website_settings()->organization_name()); | 389 website_settings()->organization_name()); |
394 } | 390 } |
395 | 391 |
396 TEST_F(WebsiteSettingsTest, HTTPSRevocationError) { | 392 TEST_F(WebsiteSettingsTest, HTTPSRevocationError) { |
397 security_info_.security_level = SecurityStateModel::SECURE; | 393 security_info_.security_level = security_state::SECURE; |
398 security_info_.scheme_is_cryptographic = true; | 394 security_info_.scheme_is_cryptographic = true; |
399 security_info_.cert_id = cert_id(); | 395 security_info_.cert_id = cert_id(); |
400 security_info_.cert_status = net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION; | 396 security_info_.cert_status = net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION; |
401 security_info_.security_bits = 81; // No error if > 80. | 397 security_info_.security_bits = 81; // No error if > 80. |
402 int status = 0; | 398 int status = 0; |
403 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 399 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
404 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 400 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
405 security_info_.connection_status = status; | 401 security_info_.connection_status = status; |
406 | 402 |
407 SetDefaultUIExpectations(mock_ui()); | 403 SetDefaultUIExpectations(mock_ui()); |
408 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 404 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
409 | 405 |
410 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 406 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
411 website_settings()->site_connection_status()); | 407 website_settings()->site_connection_status()); |
412 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN, | 408 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN, |
413 website_settings()->site_identity_status()); | 409 website_settings()->site_identity_status()); |
414 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 410 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
415 } | 411 } |
416 | 412 |
417 TEST_F(WebsiteSettingsTest, HTTPSConnectionError) { | 413 TEST_F(WebsiteSettingsTest, HTTPSConnectionError) { |
418 security_info_.security_level = SecurityStateModel::SECURE; | 414 security_info_.security_level = security_state::SECURE; |
419 security_info_.scheme_is_cryptographic = true; | 415 security_info_.scheme_is_cryptographic = true; |
420 security_info_.cert_id = cert_id(); | 416 security_info_.cert_id = cert_id(); |
421 security_info_.cert_status = 0; | 417 security_info_.cert_status = 0; |
422 security_info_.security_bits = -1; | 418 security_info_.security_bits = -1; |
423 int status = 0; | 419 int status = 0; |
424 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 420 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
425 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 421 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
426 security_info_.connection_status = status; | 422 security_info_.connection_status = status; |
427 | 423 |
428 SetDefaultUIExpectations(mock_ui()); | 424 SetDefaultUIExpectations(mock_ui()); |
429 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 425 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
430 | 426 |
431 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR, | 427 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR, |
432 website_settings()->site_connection_status()); | 428 website_settings()->site_connection_status()); |
433 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, | 429 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, |
434 website_settings()->site_identity_status()); | 430 website_settings()->site_identity_status()); |
435 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 431 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
436 } | 432 } |
437 | 433 |
438 TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) { | 434 TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) { |
439 security_info_.security_level = SecurityStateModel::SECURITY_POLICY_WARNING; | 435 security_info_.security_level = security_state::SECURITY_POLICY_WARNING; |
440 security_info_.scheme_is_cryptographic = true; | 436 security_info_.scheme_is_cryptographic = true; |
441 security_info_.cert_id = cert_id(); | 437 security_info_.cert_id = cert_id(); |
442 security_info_.cert_status = 0; | 438 security_info_.cert_status = 0; |
443 security_info_.security_bits = 81; // No error if > 80. | 439 security_info_.security_bits = 81; // No error if > 80. |
444 int status = 0; | 440 int status = 0; |
445 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 441 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
446 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 442 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
447 security_info_.connection_status = status; | 443 security_info_.connection_status = status; |
448 | 444 |
449 SetDefaultUIExpectations(mock_ui()); | 445 SetDefaultUIExpectations(mock_ui()); |
450 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 446 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
451 | 447 |
452 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 448 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
453 website_settings()->site_connection_status()); | 449 website_settings()->site_connection_status()); |
454 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT, | 450 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT, |
455 website_settings()->site_identity_status()); | 451 website_settings()->site_identity_status()); |
456 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 452 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
457 } | 453 } |
458 | 454 |
459 TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) { | 455 TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) { |
460 security_info_.security_level = SecurityStateModel::NONE; | 456 security_info_.security_level = security_state::NONE; |
461 security_info_.scheme_is_cryptographic = true; | 457 security_info_.scheme_is_cryptographic = true; |
462 security_info_.cert_id = cert_id(); | 458 security_info_.cert_id = cert_id(); |
463 security_info_.cert_status = 0; | 459 security_info_.cert_status = 0; |
464 security_info_.security_bits = 81; // No error if > 80. | 460 security_info_.security_bits = 81; // No error if > 80. |
465 int status = 0; | 461 int status = 0; |
466 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 462 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
467 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 463 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
468 security_info_.connection_status = status; | 464 security_info_.connection_status = status; |
469 security_info_.sha1_deprecation_status = | 465 security_info_.sha1_deprecation_status = |
470 SecurityStateModel::DEPRECATED_SHA1_MINOR; | 466 security_state::DEPRECATED_SHA1_MINOR; |
471 | 467 |
472 SetDefaultUIExpectations(mock_ui()); | 468 SetDefaultUIExpectations(mock_ui()); |
473 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 469 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
474 | 470 |
475 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 471 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
476 website_settings()->site_connection_status()); | 472 website_settings()->site_connection_status()); |
477 EXPECT_EQ(WebsiteSettings:: | 473 EXPECT_EQ(WebsiteSettings:: |
478 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR, | 474 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR, |
479 website_settings()->site_identity_status()); | 475 website_settings()->site_identity_status()); |
480 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 476 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
481 EXPECT_EQ(IDR_PAGEINFO_WARNING_MINOR, | 477 EXPECT_EQ(IDR_PAGEINFO_WARNING_MINOR, |
482 WebsiteSettingsUI::GetIdentityIconID( | 478 WebsiteSettingsUI::GetIdentityIconID( |
483 website_settings()->site_identity_status())); | 479 website_settings()->site_identity_status())); |
484 } | 480 } |
485 | 481 |
486 TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) { | 482 TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) { |
487 security_info_.security_level = SecurityStateModel::NONE; | 483 security_info_.security_level = security_state::NONE; |
488 security_info_.scheme_is_cryptographic = true; | 484 security_info_.scheme_is_cryptographic = true; |
489 security_info_.cert_id = cert_id(); | 485 security_info_.cert_id = cert_id(); |
490 security_info_.cert_status = 0; | 486 security_info_.cert_status = 0; |
491 security_info_.security_bits = 81; // No error if > 80. | 487 security_info_.security_bits = 81; // No error if > 80. |
492 int status = 0; | 488 int status = 0; |
493 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 489 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
494 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 490 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
495 security_info_.connection_status = status; | 491 security_info_.connection_status = status; |
496 security_info_.sha1_deprecation_status = | 492 security_info_.sha1_deprecation_status = |
497 SecurityStateModel::DEPRECATED_SHA1_MAJOR; | 493 security_state::DEPRECATED_SHA1_MAJOR; |
498 | 494 |
499 SetDefaultUIExpectations(mock_ui()); | 495 SetDefaultUIExpectations(mock_ui()); |
500 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 496 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
501 | 497 |
502 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 498 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
503 website_settings()->site_connection_status()); | 499 website_settings()->site_connection_status()); |
504 EXPECT_EQ(WebsiteSettings:: | 500 EXPECT_EQ(WebsiteSettings:: |
505 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR, | 501 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR, |
506 website_settings()->site_identity_status()); | 502 website_settings()->site_identity_status()); |
507 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 503 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
508 EXPECT_EQ(IDR_PAGEINFO_BAD, | 504 EXPECT_EQ(IDR_PAGEINFO_BAD, |
509 WebsiteSettingsUI::GetIdentityIconID( | 505 WebsiteSettingsUI::GetIdentityIconID( |
510 website_settings()->site_identity_status())); | 506 website_settings()->site_identity_status())); |
511 } | 507 } |
512 | 508 |
513 // All SCTs are from unknown logs. | 509 // All SCTs are from unknown logs. |
514 TEST_F(WebsiteSettingsTest, UnknownSCTs) { | 510 TEST_F(WebsiteSettingsTest, UnknownSCTs) { |
515 security_info_.security_level = SecurityStateModel::SECURE; | 511 security_info_.security_level = security_state::SECURE; |
516 security_info_.scheme_is_cryptographic = true; | 512 security_info_.scheme_is_cryptographic = true; |
517 security_info_.cert_id = cert_id(); | 513 security_info_.cert_id = cert_id(); |
518 security_info_.cert_status = 0; | 514 security_info_.cert_status = 0; |
519 security_info_.security_bits = 81; // No error if > 80. | 515 security_info_.security_bits = 81; // No error if > 80. |
520 int status = 0; | 516 int status = 0; |
521 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 517 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
522 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 518 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
523 security_info_.connection_status = status; | 519 security_info_.connection_status = status; |
524 | 520 |
525 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); | 521 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); |
526 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); | 522 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); |
527 | 523 |
528 SetDefaultUIExpectations(mock_ui()); | 524 SetDefaultUIExpectations(mock_ui()); |
529 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 525 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
530 | 526 |
531 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 527 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
532 website_settings()->site_connection_status()); | 528 website_settings()->site_connection_status()); |
533 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, | 529 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, |
534 website_settings()->site_identity_status()); | 530 website_settings()->site_identity_status()); |
535 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( | 531 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( |
536 website_settings()->site_identity_status())); | 532 website_settings()->site_identity_status())); |
537 } | 533 } |
538 | 534 |
539 // All SCTs are invalid. | 535 // All SCTs are invalid. |
540 TEST_F(WebsiteSettingsTest, InvalidSCTs) { | 536 TEST_F(WebsiteSettingsTest, InvalidSCTs) { |
541 security_info_.security_level = SecurityStateModel::SECURE; | 537 security_info_.security_level = security_state::SECURE; |
542 security_info_.scheme_is_cryptographic = true; | 538 security_info_.scheme_is_cryptographic = true; |
543 security_info_.cert_id = cert_id(); | 539 security_info_.cert_id = cert_id(); |
544 security_info_.cert_status = 0; | 540 security_info_.cert_status = 0; |
545 security_info_.security_bits = 81; // No error if > 80. | 541 security_info_.security_bits = 81; // No error if > 80. |
546 int status = 0; | 542 int status = 0; |
547 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 543 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
548 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 544 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
549 security_info_.connection_status = status; | 545 security_info_.connection_status = status; |
550 | 546 |
551 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); | 547 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); |
552 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); | 548 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); |
553 | 549 |
554 SetDefaultUIExpectations(mock_ui()); | 550 SetDefaultUIExpectations(mock_ui()); |
555 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 551 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
556 | 552 |
557 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 553 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
558 website_settings()->site_connection_status()); | 554 website_settings()->site_connection_status()); |
559 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, | 555 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, |
560 website_settings()->site_identity_status()); | 556 website_settings()->site_identity_status()); |
561 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( | 557 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( |
562 website_settings()->site_identity_status())); | 558 website_settings()->site_identity_status())); |
563 } | 559 } |
564 | 560 |
565 // All SCTs are valid. | 561 // All SCTs are valid. |
566 TEST_F(WebsiteSettingsTest, ValidSCTs) { | 562 TEST_F(WebsiteSettingsTest, ValidSCTs) { |
567 security_info_.security_level = SecurityStateModel::SECURE; | 563 security_info_.security_level = security_state::SECURE; |
568 security_info_.scheme_is_cryptographic = true; | 564 security_info_.scheme_is_cryptographic = true; |
569 security_info_.cert_id = cert_id(); | 565 security_info_.cert_id = cert_id(); |
570 security_info_.cert_status = 0; | 566 security_info_.cert_status = 0; |
571 security_info_.security_bits = 81; // No error if > 80. | 567 security_info_.security_bits = 81; // No error if > 80. |
572 int status = 0; | 568 int status = 0; |
573 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 569 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
574 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 570 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
575 security_info_.connection_status = status; | 571 security_info_.connection_status = status; |
576 | 572 |
577 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); | 573 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); |
(...skipping 13 matching lines...) Expand all Loading... |
591 | 587 |
592 // All SCTs are valid for an EV cert. | 588 // All SCTs are valid for an EV cert. |
593 TEST_F(WebsiteSettingsTest, ValidSCTsEV) { | 589 TEST_F(WebsiteSettingsTest, ValidSCTsEV) { |
594 scoped_refptr<net::X509Certificate> ev_cert = | 590 scoped_refptr<net::X509Certificate> ev_cert = |
595 net::X509Certificate::CreateFromBytes( | 591 net::X509Certificate::CreateFromBytes( |
596 reinterpret_cast<const char*>(google_der), sizeof(google_der)); | 592 reinterpret_cast<const char*>(google_der), sizeof(google_der)); |
597 int ev_cert_id = 1; | 593 int ev_cert_id = 1; |
598 EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)) | 594 EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)) |
599 .WillRepeatedly(DoAll(SetArgPointee<1>(ev_cert), Return(true))); | 595 .WillRepeatedly(DoAll(SetArgPointee<1>(ev_cert), Return(true))); |
600 | 596 |
601 security_info_.security_level = SecurityStateModel::SECURE; | 597 security_info_.security_level = security_state::SECURE; |
602 security_info_.scheme_is_cryptographic = true; | 598 security_info_.scheme_is_cryptographic = true; |
603 security_info_.cert_id = ev_cert_id; | 599 security_info_.cert_id = ev_cert_id; |
604 security_info_.cert_status = net::CERT_STATUS_IS_EV; | 600 security_info_.cert_status = net::CERT_STATUS_IS_EV; |
605 security_info_.security_bits = 81; // No error if > 80. | 601 security_info_.security_bits = 81; // No error if > 80. |
606 int status = 0; | 602 int status = 0; |
607 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 603 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
608 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 604 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
609 security_info_.connection_status = status; | 605 security_info_.connection_status = status; |
610 | 606 |
611 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); | 607 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); |
612 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); | 608 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); |
613 | 609 |
614 SetDefaultUIExpectations(mock_ui()); | 610 SetDefaultUIExpectations(mock_ui()); |
615 EXPECT_CALL(*mock_ui(), | 611 EXPECT_CALL(*mock_ui(), |
616 SetSelectedTab(WebsiteSettingsUI::TAB_ID_PERMISSIONS)); | 612 SetSelectedTab(WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
617 | 613 |
618 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 614 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
619 website_settings()->site_connection_status()); | 615 website_settings()->site_connection_status()); |
620 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT, | 616 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT, |
621 website_settings()->site_identity_status()); | 617 website_settings()->site_identity_status()); |
622 EXPECT_EQ(IDR_PAGEINFO_GOOD, WebsiteSettingsUI::GetIdentityIconID( | 618 EXPECT_EQ(IDR_PAGEINFO_GOOD, WebsiteSettingsUI::GetIdentityIconID( |
623 website_settings()->site_identity_status())); | 619 website_settings()->site_identity_status())); |
624 } | 620 } |
625 | 621 |
626 // A mix of unknown and invalid SCTs. | 622 // A mix of unknown and invalid SCTs. |
627 TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) { | 623 TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) { |
628 security_info_.security_level = SecurityStateModel::SECURE; | 624 security_info_.security_level = security_state::SECURE; |
629 security_info_.scheme_is_cryptographic = true; | 625 security_info_.scheme_is_cryptographic = true; |
630 security_info_.cert_id = cert_id(); | 626 security_info_.cert_id = cert_id(); |
631 security_info_.cert_status = 0; | 627 security_info_.cert_status = 0; |
632 security_info_.security_bits = 81; // No error if > 80. | 628 security_info_.security_bits = 81; // No error if > 80. |
633 int status = 0; | 629 int status = 0; |
634 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 630 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
635 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 631 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
636 security_info_.connection_status = status; | 632 security_info_.connection_status = status; |
637 | 633 |
638 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); | 634 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); |
639 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); | 635 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); |
640 | 636 |
641 SetDefaultUIExpectations(mock_ui()); | 637 SetDefaultUIExpectations(mock_ui()); |
642 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); | 638 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); |
643 | 639 |
644 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, | 640 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, |
645 website_settings()->site_connection_status()); | 641 website_settings()->site_connection_status()); |
646 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, | 642 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, |
647 website_settings()->site_identity_status()); | 643 website_settings()->site_identity_status()); |
648 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( | 644 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( |
649 website_settings()->site_identity_status())); | 645 website_settings()->site_identity_status())); |
650 } | 646 } |
651 | 647 |
652 // At least one SCT is valid and one is from an unknown log. | 648 // At least one SCT is valid and one is from an unknown log. |
653 TEST_F(WebsiteSettingsTest, ValidAndUnknownSCTs) { | 649 TEST_F(WebsiteSettingsTest, ValidAndUnknownSCTs) { |
654 security_info_.security_level = SecurityStateModel::SECURE; | 650 security_info_.security_level = security_state::SECURE; |
655 security_info_.scheme_is_cryptographic = true; | 651 security_info_.scheme_is_cryptographic = true; |
656 security_info_.cert_id = cert_id(); | 652 security_info_.cert_id = cert_id(); |
657 security_info_.cert_status = 0; | 653 security_info_.cert_status = 0; |
658 security_info_.security_bits = 81; // No error if > 80. | 654 security_info_.security_bits = 81; // No error if > 80. |
659 int status = 0; | 655 int status = 0; |
660 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); | 656 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); |
661 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); | 657 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); |
662 security_info_.connection_status = status; | 658 security_info_.connection_status = status; |
663 | 659 |
664 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); | 660 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_OK); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
716 | 712 |
717 TEST_F(WebsiteSettingsTest, InternalPage) { | 713 TEST_F(WebsiteSettingsTest, InternalPage) { |
718 SetURL("chrome://bookmarks"); | 714 SetURL("chrome://bookmarks"); |
719 SetDefaultUIExpectations(mock_ui()); | 715 SetDefaultUIExpectations(mock_ui()); |
720 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE, | 716 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE, |
721 website_settings()->site_connection_status()); | 717 website_settings()->site_connection_status()); |
722 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE, | 718 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE, |
723 website_settings()->site_identity_status()); | 719 website_settings()->site_identity_status()); |
724 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 720 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
725 } | 721 } |
OLD | NEW |