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

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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 unified diff | Download patch | Annotate | Revision Log
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.h" 8 #include "base/message_loop.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 GURL url_; 158 GURL url_;
159 }; 159 };
160 160
161 } // namespace 161 } // namespace
162 162
163 TEST_F(WebsiteSettingsTest, OnPermissionsChanged) { 163 TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
164 // Setup site permissions. 164 // Setup site permissions.
165 HostContentSettingsMap* content_settings = 165 HostContentSettingsMap* content_settings =
166 profile()->GetHostContentSettingsMap(); 166 profile()->GetHostContentSettingsMap();
167 ContentSetting setting = content_settings->GetContentSetting( 167 ContentSetting setting = content_settings->GetContentSetting(
168 url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, ""); 168 url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, std::string());
169 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); 169 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
170 setting = content_settings->GetContentSetting( 170 setting = content_settings->GetContentSetting(
171 url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, ""); 171 url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
172 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 172 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
173 setting = content_settings->GetContentSetting( 173 setting = content_settings->GetContentSetting(
174 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, ""); 174 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());
175 EXPECT_EQ(setting, CONTENT_SETTING_ASK); 175 EXPECT_EQ(setting, CONTENT_SETTING_ASK);
176 setting = content_settings->GetContentSetting( 176 setting = content_settings->GetContentSetting(
177 url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, ""); 177 url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
178 EXPECT_EQ(setting, CONTENT_SETTING_ASK); 178 EXPECT_EQ(setting, CONTENT_SETTING_ASK);
179 setting = content_settings->GetContentSetting( 179 setting = content_settings->GetContentSetting(
180 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, ""); 180 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string());
181 EXPECT_EQ(setting, CONTENT_SETTING_ASK); 181 EXPECT_EQ(setting, CONTENT_SETTING_ASK);
182 setting = content_settings->GetContentSetting( 182 setting = content_settings->GetContentSetting(
183 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, ""); 183 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string());
184 EXPECT_EQ(setting, CONTENT_SETTING_ASK); 184 EXPECT_EQ(setting, CONTENT_SETTING_ASK);
185 185
186 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_)); 186 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
187 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)); 187 EXPECT_CALL(*mock_ui(), SetCookieInfo(_));
188 EXPECT_CALL(*mock_ui(), SetFirstVisit(string16())); 188 EXPECT_CALL(*mock_ui(), SetFirstVisit(string16()));
189 189
190 // SetPermissionInfo() is called once initially, and then again every time 190 // SetPermissionInfo() is called once initially, and then again every time
191 // OnSitePermissionChanged() is called. 191 // OnSitePermissionChanged() is called.
192 // TODO(markusheintz): This is a temporary hack to fix issue: http://crbug.com/1 44203. 192 // TODO(markusheintz): This is a temporary hack to fix issue: http://crbug.com/1 44203.
193 #if defined(OS_MACOSX) 193 #if defined(OS_MACOSX)
(...skipping 11 matching lines...) Expand all
205 CONTENT_SETTING_BLOCK); 205 CONTENT_SETTING_BLOCK);
206 website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_GEOLOCATION, 206 website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_GEOLOCATION,
207 CONTENT_SETTING_ALLOW); 207 CONTENT_SETTING_ALLOW);
208 website_settings()->OnSitePermissionChanged( 208 website_settings()->OnSitePermissionChanged(
209 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW); 209 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW);
210 website_settings()->OnSitePermissionChanged( 210 website_settings()->OnSitePermissionChanged(
211 CONTENT_SETTINGS_TYPE_MEDIASTREAM, CONTENT_SETTING_ALLOW); 211 CONTENT_SETTINGS_TYPE_MEDIASTREAM, CONTENT_SETTING_ALLOW);
212 212
213 // Verify that the site permissions were changed correctly. 213 // Verify that the site permissions were changed correctly.
214 setting = content_settings->GetContentSetting( 214 setting = content_settings->GetContentSetting(
215 url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, ""); 215 url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, std::string());
216 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 216 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
217 setting = content_settings->GetContentSetting( 217 setting = content_settings->GetContentSetting(
218 url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, ""); 218 url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
219 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); 219 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
220 setting = content_settings->GetContentSetting( 220 setting = content_settings->GetContentSetting(
221 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, ""); 221 url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());
222 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 222 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
223 setting = content_settings->GetContentSetting( 223 setting = content_settings->GetContentSetting(
224 url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, ""); 224 url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
225 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 225 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
226 setting = content_settings->GetContentSetting( 226 setting = content_settings->GetContentSetting(
227 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, ""); 227 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string());
228 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 228 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
229 setting = content_settings->GetContentSetting( 229 setting = content_settings->GetContentSetting(
230 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, ""); 230 url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string());
231 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW); 231 EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
232 } 232 }
233 233
234 TEST_F(WebsiteSettingsTest, OnSiteDataAccessed) { 234 TEST_F(WebsiteSettingsTest, OnSiteDataAccessed) {
235 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_)); 235 EXPECT_CALL(*mock_ui(), SetPermissionInfo(_));
236 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_)); 236 EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
237 EXPECT_CALL(*mock_ui(), SetFirstVisit(string16())); 237 EXPECT_CALL(*mock_ui(), SetFirstVisit(string16()));
238 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)).Times(2); 238 EXPECT_CALL(*mock_ui(), SetCookieInfo(_)).Times(2);
239 EXPECT_CALL(*mock_ui(), SetSelectedTab( 239 EXPECT_CALL(*mock_ui(), SetSelectedTab(
240 WebsiteSettingsUI::TAB_ID_PERMISSIONS)); 240 WebsiteSettingsUI::TAB_ID_PERMISSIONS));
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 website_settings()->OnUIClosing(); 396 website_settings()->OnUIClosing();
397 EXPECT_EQ(1u, infobar_service()->GetInfoBarCount()); 397 EXPECT_EQ(1u, infobar_service()->GetInfoBarCount());
398 398
399 // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete 399 // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete
400 // it. Hence the |delegate| must be cleaned up after it was removed from the 400 // it. Hence the |delegate| must be cleaned up after it was removed from the
401 // |infobar_service|. 401 // |infobar_service|.
402 scoped_ptr<InfoBarDelegate> delegate( 402 scoped_ptr<InfoBarDelegate> delegate(
403 infobar_service()->GetInfoBarDelegateAt(0)); 403 infobar_service()->GetInfoBarDelegateAt(0));
404 infobar_service()->RemoveInfoBar(delegate.get()); 404 infobar_service()->RemoveInfoBar(delegate.get());
405 } 405 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698