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

Unified Diff: chrome/browser/website_settings_unittest.cc

Issue 10163002: Add tabs UI to WebsiteSettingsUI (GTK only). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Again: Removing UI string changes from this CL. Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/website_settings.cc ('K') | « chrome/browser/website_settings.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/website_settings_unittest.cc
diff --git a/chrome/browser/website_settings_unittest.cc b/chrome/browser/website_settings_unittest.cc
index 9b70c1626844e255b775aa3b16a3bde1c60ac233..da121f7eca68e1d45a3341545061166957c5f108 100644
--- a/chrome/browser/website_settings_unittest.cc
+++ b/chrome/browser/website_settings_unittest.cc
@@ -57,10 +57,10 @@ class MockWebsiteSettingsUI : public WebsiteSettingsUI {
public:
virtual ~MockWebsiteSettingsUI() {}
MOCK_METHOD1(SetPresenter, void(WebsiteSettings* presenter));
- MOCK_METHOD1(SetSiteInfo, void(const std::string& site_info));
MOCK_METHOD1(SetCookieInfo, void(const CookieInfoList& cookie_info_list));
MOCK_METHOD1(SetPermissionInfo,
void(const PermissionInfoList& permission_info_list));
+ MOCK_METHOD1(SetIdentityInfo, void(const IdentityInfo& identity_info));
};
class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
@@ -115,7 +115,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
void SetDefaultUIExpectations(MockWebsiteSettingsUI* mock_ui) {
// During creation |WebsiteSettings| makes the following calls to the ui.
EXPECT_CALL(*mock_ui, SetPermissionInfo(_));
- EXPECT_CALL(*mock_ui, SetSiteInfo(_));
+ EXPECT_CALL(*mock_ui, SetIdentityInfo(_));
EXPECT_CALL(*mock_ui, SetPresenter(_));
EXPECT_CALL(*mock_ui, SetCookieInfo(_));
}
@@ -202,7 +202,7 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
TEST_F(WebsiteSettingsTest, OnSiteDataAccessed) {
EXPECT_CALL(*mock_ui(), SetPermissionInfo(_));
- EXPECT_CALL(*mock_ui(), SetSiteInfo(_));
+ EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
EXPECT_CALL(*mock_ui(), SetPresenter(_));
EXPECT_CALL(*mock_ui(), SetCookieInfo(_)).Times(2);
« chrome/browser/website_settings.cc ('K') | « chrome/browser/website_settings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698