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

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

Issue 2702923002: Page Info: Hide default permissions with a value of Ask if the default is Ask. (Closed)
Patch Set: Fix existing tests. Created 3 years, 10 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // Clear cipher suite bits (the 16 lowest bits). 66 // Clear cipher suite bits (the 16 lowest bits).
67 connection_status &= ~net::SSL_CONNECTION_CIPHERSUITE_MASK; 67 connection_status &= ~net::SSL_CONNECTION_CIPHERSUITE_MASK;
68 return cipher_suite | connection_status; 68 return cipher_suite | connection_status;
69 } 69 }
70 70
71 class MockWebsiteSettingsUI : public WebsiteSettingsUI { 71 class MockWebsiteSettingsUI : public WebsiteSettingsUI {
72 public: 72 public:
73 virtual ~MockWebsiteSettingsUI() {} 73 virtual ~MockWebsiteSettingsUI() {}
74 MOCK_METHOD1(SetCookieInfo, void(const CookieInfoList& cookie_info_list)); 74 MOCK_METHOD1(SetCookieInfo, void(const CookieInfoList& cookie_info_list));
75 MOCK_METHOD0(SetPermissionInfoStub, void()); 75 MOCK_METHOD0(SetPermissionInfoStub, void());
76 MOCK_METHOD1(UpdatePermissionButton,
77 void(VisiblePermissions visible_permissions));
76 MOCK_METHOD1(SetIdentityInfo, void(const IdentityInfo& identity_info)); 78 MOCK_METHOD1(SetIdentityInfo, void(const IdentityInfo& identity_info));
77 79
78 void SetPermissionInfo( 80 void SetPermissionInfo(
79 const PermissionInfoList& permission_info_list, 81 const PermissionInfoList& permission_info_list,
80 ChosenObjectInfoList chosen_object_info_list) override { 82 ChosenObjectInfoList chosen_object_info_list) override {
81 SetPermissionInfoStub(); 83 SetPermissionInfoStub();
82 if (set_permission_info_callback_) { 84 if (set_permission_info_callback_) {
83 set_permission_info_callback_.Run(permission_info_list, 85 set_permission_info_callback_.Run(permission_info_list,
84 std::move(chosen_object_info_list)); 86 std::move(chosen_object_info_list));
85 } 87 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 << "No WebsiteSettings instance created."; 125 << "No WebsiteSettings instance created.";
124 RenderViewHostTestHarness::TearDown(); 126 RenderViewHostTestHarness::TearDown();
125 website_settings_.reset(); 127 website_settings_.reset();
126 } 128 }
127 129
128 void SetDefaultUIExpectations(MockWebsiteSettingsUI* mock_ui) { 130 void SetDefaultUIExpectations(MockWebsiteSettingsUI* mock_ui) {
129 // During creation |WebsiteSettings| makes the following calls to the ui. 131 // During creation |WebsiteSettings| makes the following calls to the ui.
130 EXPECT_CALL(*mock_ui, SetPermissionInfoStub()); 132 EXPECT_CALL(*mock_ui, SetPermissionInfoStub());
131 EXPECT_CALL(*mock_ui, SetIdentityInfo(_)); 133 EXPECT_CALL(*mock_ui, SetIdentityInfo(_));
132 EXPECT_CALL(*mock_ui, SetCookieInfo(_)); 134 EXPECT_CALL(*mock_ui, SetCookieInfo(_));
135 EXPECT_CALL(*mock_ui, UpdatePermissionButton(_));
133 } 136 }
134 137
135 void SetURL(const std::string& url) { url_ = GURL(url); } 138 void SetURL(const std::string& url) { url_ = GURL(url); }
136 139
137 void SetPermissionInfo(const PermissionInfoList& permission_info_list, 140 void SetPermissionInfo(const PermissionInfoList& permission_info_list,
138 ChosenObjectInfoList chosen_object_info_list) { 141 ChosenObjectInfoList chosen_object_info_list) {
139 last_chosen_object_info_.clear(); 142 last_chosen_object_info_.clear();
140 for (auto& chosen_object_info : chosen_object_info_list) 143 for (auto& chosen_object_info : chosen_object_info_list)
141 last_chosen_object_info_.push_back(std::move(chosen_object_info)); 144 last_chosen_object_info_.push_back(std::move(chosen_object_info));
142 } 145 }
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 EXPECT_EQ(0u, infobar_service()->infobar_count()); 627 EXPECT_EQ(0u, infobar_service()->infobar_count());
625 website_settings()->OnUIClosing(); 628 website_settings()->OnUIClosing();
626 EXPECT_EQ(0u, infobar_service()->infobar_count()); 629 EXPECT_EQ(0u, infobar_service()->infobar_count());
627 } 630 }
628 631
629 TEST_F(WebsiteSettingsTest, ShowInfoBar) { 632 TEST_F(WebsiteSettingsTest, ShowInfoBar) {
630 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_)); 633 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
631 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)); 634 EXPECT_CALL(*mock_ui(), SetCookieInfo(_));
632 635
633 EXPECT_CALL(*mock_ui(), SetPermissionInfoStub()).Times(2); 636 EXPECT_CALL(*mock_ui(), SetPermissionInfoStub()).Times(2);
637 EXPECT_CALL(*mock_ui(), UpdatePermissionButton(_)).Times(2);
634 638
635 EXPECT_EQ(0u, infobar_service()->infobar_count()); 639 EXPECT_EQ(0u, infobar_service()->infobar_count());
636 website_settings()->OnSitePermissionChanged( 640 website_settings()->OnSitePermissionChanged(
637 CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); 641 CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
638 website_settings()->OnUIClosing(); 642 website_settings()->OnUIClosing();
639 ASSERT_EQ(1u, infobar_service()->infobar_count()); 643 ASSERT_EQ(1u, infobar_service()->infobar_count());
640 644
641 infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0)); 645 infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0));
642 } 646 }
643 #endif 647 #endif
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 histograms.ExpectBucketCount( 719 histograms.ExpectBucketCount(
716 kGenericHistogram, 720 kGenericHistogram,
717 WebsiteSettings::WebsiteSettingsAction::WEBSITE_SETTINGS_OPENED, 2); 721 WebsiteSettings::WebsiteSettingsAction::WEBSITE_SETTINGS_OPENED, 2);
718 722
719 histograms.ExpectTotalCount(test.histogram_name, 2); 723 histograms.ExpectTotalCount(test.histogram_name, 2);
720 histograms.ExpectBucketCount( 724 histograms.ExpectBucketCount(
721 test.histogram_name, 725 test.histogram_name,
722 WebsiteSettings::WebsiteSettingsAction::WEBSITE_SETTINGS_OPENED, 2); 726 WebsiteSettings::WebsiteSettingsAction::WEBSITE_SETTINGS_OPENED, 2);
723 } 727 }
724 } 728 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698