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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 2241213002: Distinguish between SCT invalidity reasons in UMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing _MAX to be the last value Created 4 years, 4 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 (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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 security_info_.security_level = SecurityStateModel::SECURE; 610 security_info_.security_level = SecurityStateModel::SECURE;
611 security_info_.scheme_is_cryptographic = true; 611 security_info_.scheme_is_cryptographic = true;
612 security_info_.cert_id = cert_id(); 612 security_info_.cert_id = cert_id();
613 security_info_.cert_status = 0; 613 security_info_.cert_status = 0;
614 security_info_.security_bits = 81; // No error if > 80. 614 security_info_.security_bits = 81; // No error if > 80.
615 int status = 0; 615 int status = 0;
616 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); 616 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
617 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); 617 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
618 security_info_.connection_status = status; 618 security_info_.connection_status = status;
619 619
620 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); 620 security_info_.sct_verify_statuses.push_back(
621 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); 621 net::ct::SCT_STATUS_INVALID_TIMESTAMP);
622 security_info_.sct_verify_statuses.push_back(
623 net::ct::SCT_STATUS_INVALID_SIGNATURE);
622 624
623 SetDefaultUIExpectations(mock_ui()); 625 SetDefaultUIExpectations(mock_ui());
624 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); 626 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION));
625 627
626 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, 628 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED,
627 website_settings()->site_connection_status()); 629 website_settings()->site_connection_status());
628 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, 630 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR,
629 website_settings()->site_identity_status()); 631 website_settings()->site_identity_status());
630 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( 632 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID(
631 website_settings()->site_identity_status())); 633 website_settings()->site_identity_status()));
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 security_info_.scheme_is_cryptographic = true; 700 security_info_.scheme_is_cryptographic = true;
699 security_info_.cert_id = cert_id(); 701 security_info_.cert_id = cert_id();
700 security_info_.cert_status = 0; 702 security_info_.cert_status = 0;
701 security_info_.security_bits = 81; // No error if > 80. 703 security_info_.security_bits = 81; // No error if > 80.
702 int status = 0; 704 int status = 0;
703 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1); 705 status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
704 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256); 706 status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
705 security_info_.connection_status = status; 707 security_info_.connection_status = status;
706 708
707 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN); 709 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_LOG_UNKNOWN);
708 security_info_.sct_verify_statuses.push_back(net::ct::SCT_STATUS_INVALID); 710 security_info_.sct_verify_statuses.push_back(
711 net::ct::SCT_STATUS_INVALID_SIGNATURE);
709 712
710 SetDefaultUIExpectations(mock_ui()); 713 SetDefaultUIExpectations(mock_ui());
711 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION)); 714 EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION));
712 715
713 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED, 716 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED,
714 website_settings()->site_connection_status()); 717 website_settings()->site_connection_status());
715 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR, 718 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CT_ERROR,
716 website_settings()->site_identity_status()); 719 website_settings()->site_identity_status());
717 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID( 720 EXPECT_EQ(IDR_PAGEINFO_BAD, WebsiteSettingsUI::GetIdentityIconID(
718 website_settings()->site_identity_status())); 721 website_settings()->site_identity_status()));
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 788
786 TEST_F(WebsiteSettingsTest, InternalPage) { 789 TEST_F(WebsiteSettingsTest, InternalPage) {
787 SetURL("chrome://bookmarks"); 790 SetURL("chrome://bookmarks");
788 SetDefaultUIExpectations(mock_ui()); 791 SetDefaultUIExpectations(mock_ui());
789 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE, 792 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE,
790 website_settings()->site_connection_status()); 793 website_settings()->site_connection_status());
791 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE, 794 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE,
792 website_settings()->site_identity_status()); 795 website_settings()->site_identity_status());
793 EXPECT_EQ(base::string16(), website_settings()->organization_name()); 796 EXPECT_EQ(base::string16(), website_settings()->organization_name());
794 } 797 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | content/common/ssl_status_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698