| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #import "chrome/browser/ui/cocoa/content_exceptions_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/content_exceptions_window_controller.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #import "base/scoped_nsobject.h" | 9 #import "base/scoped_nsobject.h" |
| 10 #include "base/ref_counted.h" | 10 #include "base/ref_counted.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 EnterText(@"addedhost\n"); | 153 EnterText(@"addedhost\n"); |
| 154 | 154 |
| 155 EXPECT_FALSE([controller editingNewException]); | 155 EXPECT_FALSE([controller editingNewException]); |
| 156 [controller close]; | 156 [controller close]; |
| 157 | 157 |
| 158 HostContentSettingsMap::SettingsForOneType settings; | 158 HostContentSettingsMap::SettingsForOneType settings; |
| 159 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, | 159 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 160 "", | 160 "", |
| 161 &settings); | 161 &settings); |
| 162 EXPECT_EQ(1u, settings.size()); | 162 EXPECT_EQ(1u, settings.size()); |
| 163 EXPECT_EQ(HostContentSettingsMap::Pattern("addedhost"), settings[0].first); | 163 EXPECT_EQ(ContentSettingsPattern("addedhost"), settings[0].first); |
| 164 } | 164 } |
| 165 | 165 |
| 166 TEST_F(ContentExceptionsWindowControllerTest, AddEscDoesNotAdd) { | 166 TEST_F(ContentExceptionsWindowControllerTest, AddEscDoesNotAdd) { |
| 167 ContentExceptionsWindowController* controller = | 167 ContentExceptionsWindowController* controller = |
| 168 GetController(CONTENT_SETTINGS_TYPE_PLUGINS); | 168 GetController(CONTENT_SETTINGS_TYPE_PLUGINS); |
| 169 | 169 |
| 170 ClickAdd(controller); | 170 ClickAdd(controller); |
| 171 EnterText(@"addedhost"); // but do not press enter | 171 EnterText(@"addedhost"); // but do not press enter |
| 172 HitEscape(controller); | 172 HitEscape(controller); |
| 173 | 173 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 195 [controller close]; | 195 [controller close]; |
| 196 | 196 |
| 197 HostContentSettingsMap::SettingsForOneType settings; | 197 HostContentSettingsMap::SettingsForOneType settings; |
| 198 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, | 198 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 199 "", | 199 "", |
| 200 &settings); | 200 &settings); |
| 201 EXPECT_EQ(0u, settings.size()); | 201 EXPECT_EQ(0u, settings.size()); |
| 202 } | 202 } |
| 203 | 203 |
| 204 TEST_F(ContentExceptionsWindowControllerTest, AddExistingEditAdd) { | 204 TEST_F(ContentExceptionsWindowControllerTest, AddExistingEditAdd) { |
| 205 settingsMap_->SetContentSetting(HostContentSettingsMap::Pattern("myhost"), | 205 settingsMap_->SetContentSetting(ContentSettingsPattern("myhost"), |
| 206 CONTENT_SETTINGS_TYPE_PLUGINS, | 206 CONTENT_SETTINGS_TYPE_PLUGINS, |
| 207 "", | 207 "", |
| 208 CONTENT_SETTING_BLOCK); | 208 CONTENT_SETTING_BLOCK); |
| 209 | 209 |
| 210 ContentExceptionsWindowController* controller = | 210 ContentExceptionsWindowController* controller = |
| 211 GetController(CONTENT_SETTINGS_TYPE_PLUGINS); | 211 GetController(CONTENT_SETTINGS_TYPE_PLUGINS); |
| 212 | 212 |
| 213 ClickAdd(controller); | 213 ClickAdd(controller); |
| 214 EnterText(@"myhost"); // but do not press enter | 214 EnterText(@"myhost"); // but do not press enter |
| 215 ClickAdd(controller); | 215 ClickAdd(controller); |
| 216 | 216 |
| 217 EXPECT_TRUE([controller editingNewException]); | 217 EXPECT_TRUE([controller editingNewException]); |
| 218 [controller close]; | 218 [controller close]; |
| 219 | 219 |
| 220 | 220 |
| 221 HostContentSettingsMap::SettingsForOneType settings; | 221 HostContentSettingsMap::SettingsForOneType settings; |
| 222 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, | 222 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 223 "", | 223 "", |
| 224 &settings); | 224 &settings); |
| 225 EXPECT_EQ(1u, settings.size()); | 225 EXPECT_EQ(1u, settings.size()); |
| 226 } | 226 } |
| 227 | 227 |
| 228 TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) { | 228 TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) { |
| 229 settingsMap_->SetContentSetting(HostContentSettingsMap::Pattern("myhost"), | 229 settingsMap_->SetContentSetting(ContentSettingsPattern("myhost"), |
| 230 CONTENT_SETTINGS_TYPE_COOKIES, | 230 CONTENT_SETTINGS_TYPE_COOKIES, |
| 231 "", | 231 "", |
| 232 CONTENT_SETTING_SESSION_ONLY); | 232 CONTENT_SETTING_SESSION_ONLY); |
| 233 | 233 |
| 234 ContentExceptionsWindowController* controller = | 234 ContentExceptionsWindowController* controller = |
| 235 GetController(CONTENT_SETTINGS_TYPE_COOKIES); | 235 GetController(CONTENT_SETTINGS_TYPE_COOKIES); |
| 236 | 236 |
| 237 ClickAdd(controller); | 237 ClickAdd(controller); |
| 238 EnterText(@"myhost\n"); | 238 EnterText(@"myhost\n"); |
| 239 | 239 |
| 240 EXPECT_FALSE([controller editingNewException]); | 240 EXPECT_FALSE([controller editingNewException]); |
| 241 [controller close]; | 241 [controller close]; |
| 242 | 242 |
| 243 HostContentSettingsMap::SettingsForOneType settings; | 243 HostContentSettingsMap::SettingsForOneType settings; |
| 244 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_COOKIES, | 244 settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_COOKIES, |
| 245 "", | 245 "", |
| 246 &settings); | 246 &settings); |
| 247 EXPECT_EQ(1u, settings.size()); | 247 EXPECT_EQ(1u, settings.size()); |
| 248 EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY, settings[0].second); | 248 EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY, settings[0].second); |
| 249 } | 249 } |
| 250 | 250 |
| 251 | 251 |
| 252 } // namespace | 252 } // namespace |
| OLD | NEW |