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

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

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

Powered by Google App Engine
This is Rietveld 408576698