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" |
11 #include "chrome/browser/content_settings/content_settings_provider.h" | 11 #include "chrome/browser/content_settings/content_settings_provider.h" |
12 #include "chrome/browser/content_settings/content_settings_utils.h" | 12 #include "chrome/browser/content_settings/content_settings_utils.h" |
13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 13 #include "chrome/browser/content_settings/host_content_settings_map.h" |
14 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 14 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
15 #include "chrome/browser/infobars/infobar.h" | 15 #include "chrome/browser/infobars/infobar.h" |
| 16 #include "chrome/browser/infobars/infobar_manager.h" |
16 #include "chrome/browser/infobars/infobar_service.h" | 17 #include "chrome/browser/infobars/infobar_service.h" |
17 #include "chrome/browser/ui/website_settings/website_settings_ui.h" | 18 #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
18 #include "chrome/common/content_settings.h" | 19 #include "chrome/common/content_settings.h" |
19 #include "chrome/common/content_settings_types.h" | 20 #include "chrome/common/content_settings_types.h" |
20 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 21 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
21 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
22 #include "content/public/browser/cert_store.h" | 23 #include "content/public/browser/cert_store.h" |
23 #include "content/public/common/ssl_status.h" | 24 #include "content/public/common/ssl_status.h" |
24 #include "net/cert/cert_status_flags.h" | 25 #include "net/cert/cert_status_flags.h" |
25 #include "net/cert/x509_certificate.h" | 26 #include "net/cert/x509_certificate.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 website_settings()->site_connection_status()); | 358 website_settings()->site_connection_status()); |
358 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, | 359 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_CERT, |
359 website_settings()->site_identity_status()); | 360 website_settings()->site_identity_status()); |
360 EXPECT_EQ(base::string16(), website_settings()->organization_name()); | 361 EXPECT_EQ(base::string16(), website_settings()->organization_name()); |
361 } | 362 } |
362 | 363 |
363 TEST_F(WebsiteSettingsTest, NoInfoBar) { | 364 TEST_F(WebsiteSettingsTest, NoInfoBar) { |
364 SetDefaultUIExpectations(mock_ui()); | 365 SetDefaultUIExpectations(mock_ui()); |
365 EXPECT_CALL(*mock_ui(), SetSelectedTab( | 366 EXPECT_CALL(*mock_ui(), SetSelectedTab( |
366 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); | 367 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
367 EXPECT_EQ(0u, infobar_service()->infobar_count()); | 368 EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count()); |
368 website_settings()->OnUIClosing(); | 369 website_settings()->OnUIClosing(); |
369 EXPECT_EQ(0u, infobar_service()->infobar_count()); | 370 EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count()); |
370 } | 371 } |
371 | 372 |
372 TEST_F(WebsiteSettingsTest, ShowInfoBar) { | 373 TEST_F(WebsiteSettingsTest, ShowInfoBar) { |
373 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_)); | 374 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_)); |
374 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)); | 375 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)); |
375 EXPECT_CALL(*mock_ui(), SetFirstVisit(base::string16())); | 376 EXPECT_CALL(*mock_ui(), SetFirstVisit(base::string16())); |
376 | 377 |
377 // SetPermissionInfo() is called once initially, and then again every time | 378 // SetPermissionInfo() is called once initially, and then again every time |
378 // OnSitePermissionChanged() is called. | 379 // OnSitePermissionChanged() is called. |
379 // TODO(markusheintz): This is a temporary hack to fix issue: | 380 // TODO(markusheintz): This is a temporary hack to fix issue: |
380 // http://crbug.com/144203. | 381 // http://crbug.com/144203. |
381 #if defined(OS_MACOSX) | 382 #if defined(OS_MACOSX) |
382 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_)).Times(2); | 383 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_)).Times(2); |
383 #else | 384 #else |
384 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_)).Times(1); | 385 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_)).Times(1); |
385 #endif | 386 #endif |
386 | 387 |
387 EXPECT_CALL(*mock_ui(), SetSelectedTab( | 388 EXPECT_CALL(*mock_ui(), SetSelectedTab( |
388 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); | 389 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
389 EXPECT_EQ(0u, infobar_service()->infobar_count()); | 390 InfoBarManager* infobar_manager = infobar_service()->infobar_manager(); |
| 391 EXPECT_EQ(0u, infobar_manager->infobar_count()); |
390 website_settings()->OnSitePermissionChanged( | 392 website_settings()->OnSitePermissionChanged( |
391 CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); | 393 CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); |
392 website_settings()->OnUIClosing(); | 394 website_settings()->OnUIClosing(); |
393 ASSERT_EQ(1u, infobar_service()->infobar_count()); | 395 ASSERT_EQ(1u, infobar_manager->infobar_count()); |
394 | 396 |
395 infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0)); | 397 infobar_manager->RemoveInfoBar(infobar_manager->infobar_at(0)); |
396 } | 398 } |
OLD | NEW |