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