OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/extensions/extension_service_unittest.h" | 8 #include "chrome/browser/extensions/extension_service_unittest.h" |
9 #include "chrome/browser/extensions/unpacked_installer.h" | 9 #include "chrome/browser/extensions/unpacked_installer.h" |
10 #include "chrome/browser/managed_mode/managed_user_service.h" | 10 #include "chrome/browser/managed_mode/managed_user_service.h" |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 GetActiveSiteLists(&managed_user_service); | 181 GetActiveSiteLists(&managed_user_service); |
182 ASSERT_EQ(0u, site_lists.size()); | 182 ASSERT_EQ(0u, site_lists.size()); |
183 EXPECT_EQ(ManagedModeURLFilter::ALLOW, | 183 EXPECT_EQ(ManagedModeURLFilter::ALLOW, |
184 url_filter->GetFilteringBehaviorForURL(url)); | 184 url_filter->GetFilteringBehaviorForURL(url)); |
185 } | 185 } |
186 | 186 |
187 TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) { | 187 TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) { |
188 profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true); | 188 profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true); |
189 ManagedUserService managed_user_service(profile_.get()); | 189 ManagedUserService managed_user_service(profile_.get()); |
190 managed_user_service.Init(); | 190 managed_user_service.Init(); |
191 managed_user_service.SetElevated(true); | |
192 ManagedModeURLFilter* url_filter = | 191 ManagedModeURLFilter* url_filter = |
193 managed_user_service.GetURLFilterForUIThread(); | 192 managed_user_service.GetURLFilterForUIThread(); |
194 ManagedModeURLFilterObserver observer(url_filter); | 193 ManagedModeURLFilterObserver observer(url_filter); |
195 observer.Wait(); | 194 observer.Wait(); |
196 | 195 |
197 GURL example_url("http://example.com"); | 196 GURL example_url("http://example.com"); |
198 GURL moose_url("http://moose.org"); | 197 GURL moose_url("http://moose.org"); |
199 EXPECT_EQ(ManagedModeURLFilter::BLOCK, | 198 EXPECT_EQ(ManagedModeURLFilter::BLOCK, |
200 url_filter->GetFilteringBehaviorForURL(example_url)); | 199 url_filter->GetFilteringBehaviorForURL(example_url)); |
201 | 200 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 EXPECT_TRUE(site_names.count("Moose") == 1u); | 265 EXPECT_TRUE(site_names.count("Moose") == 1u); |
267 | 266 |
268 #if defined(ENABLE_CONFIGURATION_POLICY) | 267 #if defined(ENABLE_CONFIGURATION_POLICY) |
269 EXPECT_EQ(ManagedModeURLFilter::ALLOW, | 268 EXPECT_EQ(ManagedModeURLFilter::ALLOW, |
270 url_filter->GetFilteringBehaviorForURL(example_url)); | 269 url_filter->GetFilteringBehaviorForURL(example_url)); |
271 EXPECT_EQ(ManagedModeURLFilter::ALLOW, | 270 EXPECT_EQ(ManagedModeURLFilter::ALLOW, |
272 url_filter->GetFilteringBehaviorForURL(moose_url)); | 271 url_filter->GetFilteringBehaviorForURL(moose_url)); |
273 #endif | 272 #endif |
274 | 273 |
275 // Disable the first content pack. | 274 // Disable the first content pack. |
| 275 managed_user_service.AddElevationForExtension(extension->id()); |
276 service_->DisableExtension(extension->id(), | 276 service_->DisableExtension(extension->id(), |
277 extensions::Extension::DISABLE_USER_ACTION); | 277 extensions::Extension::DISABLE_USER_ACTION); |
| 278 managed_user_service.RemoveElevationForExtension(extension->id()); |
278 observer.Wait(); | 279 observer.Wait(); |
279 | 280 |
280 site_lists = GetActiveSiteLists(&managed_user_service); | 281 site_lists = GetActiveSiteLists(&managed_user_service); |
281 ASSERT_EQ(1u, site_lists.size()); | 282 ASSERT_EQ(1u, site_lists.size()); |
282 sites.clear(); | 283 sites.clear(); |
283 site_lists[0]->GetSites(&sites); | 284 site_lists[0]->GetSites(&sites); |
284 ASSERT_EQ(1u, sites.size()); | 285 ASSERT_EQ(1u, sites.size()); |
285 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name); | 286 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name); |
286 | 287 |
287 EXPECT_EQ(ManagedModeURLFilter::WARN, | 288 EXPECT_EQ(ManagedModeURLFilter::WARN, |
288 url_filter->GetFilteringBehaviorForURL(example_url)); | 289 url_filter->GetFilteringBehaviorForURL(example_url)); |
289 #if defined(ENABLE_CONFIGURATION_POLICY) | 290 #if defined(ENABLE_CONFIGURATION_POLICY) |
290 EXPECT_EQ(ManagedModeURLFilter::ALLOW, | 291 EXPECT_EQ(ManagedModeURLFilter::ALLOW, |
291 url_filter->GetFilteringBehaviorForURL(moose_url)); | 292 url_filter->GetFilteringBehaviorForURL(moose_url)); |
292 #endif | 293 #endif |
293 } | 294 } |
OLD | NEW |