OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/prefs/scoped_user_pref_update.h" | 7 #include "base/prefs/scoped_user_pref_update.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/extensions/extension_service_test_base.h" | 11 #include "chrome/browser/extensions/extension_service_test_base.h" |
12 #include "chrome/browser/extensions/unpacked_installer.h" | 12 #include "chrome/browser/extensions/unpacked_installer.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" | 14 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" |
15 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 15 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 16 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
17 #include "chrome/browser/supervised_user/custodian_profile_downloader_service.h" | 17 #include "chrome/browser/supervised_user/custodian_profile_downloader_service.h" |
18 #include "chrome/browser/supervised_user/custodian_profile_downloader_service_fa
ctory.h" | 18 #include "chrome/browser/supervised_user/custodian_profile_downloader_service_fa
ctory.h" |
19 #include "chrome/browser/supervised_user/supervised_user_service.h" | 19 #include "chrome/browser/supervised_user/supervised_user_service.h" |
20 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 20 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
21 #include "chrome/browser/ui/browser_list.h" | 21 #include "chrome/browser/ui/browser_list.h" |
22 #include "chrome/common/chrome_paths.h" | 22 #include "chrome/common/chrome_paths.h" |
23 #include "chrome/common/extensions/features/feature_channel.h" | 23 #include "chrome/common/extensions/features/feature_channel.h" |
24 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
25 #include "chrome/test/base/testing_profile.h" | 25 #include "chrome/test/base/testing_profile.h" |
26 #include "content/public/test/test_browser_thread_bundle.h" | 26 #include "content/public/test/test_browser_thread_bundle.h" |
27 #include "content/public/test/test_utils.h" | 27 #include "content/public/test/test_utils.h" |
| 28 #include "extensions/browser/install_flag.h" |
28 #include "extensions/common/extension.h" | 29 #include "extensions/common/extension.h" |
29 #include "extensions/common/extension_builder.h" | 30 #include "extensions/common/extension_builder.h" |
30 #include "extensions/common/manifest_constants.h" | 31 #include "extensions/common/manifest_constants.h" |
31 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
32 | 33 |
33 using content::MessageLoopRunner; | 34 using content::MessageLoopRunner; |
34 | 35 |
35 namespace { | 36 namespace { |
36 | 37 |
37 void OnProfileDownloadedFail(const base::string16& full_name) { | 38 void OnProfileDownloadedFail(const base::string16& full_name) { |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 }; | 232 }; |
232 | 233 |
233 TEST_F(SupervisedUserServiceExtensionTestUnsupervised, | 234 TEST_F(SupervisedUserServiceExtensionTestUnsupervised, |
234 ExtensionManagementPolicyProvider) { | 235 ExtensionManagementPolicyProvider) { |
235 SupervisedUserService* supervised_user_service = | 236 SupervisedUserService* supervised_user_service = |
236 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | 237 SupervisedUserServiceFactory::GetForProfile(profile_.get()); |
237 EXPECT_FALSE(profile_->IsSupervised()); | 238 EXPECT_FALSE(profile_->IsSupervised()); |
238 | 239 |
239 scoped_refptr<extensions::Extension> extension = MakeExtension(); | 240 scoped_refptr<extensions::Extension> extension = MakeExtension(); |
240 base::string16 error_1; | 241 base::string16 error_1; |
241 EXPECT_TRUE(supervised_user_service->UserMayLoad(extension.get(), &error_1)); | 242 EXPECT_TRUE(supervised_user_service->UserMayLoad( |
| 243 extension.get(), extensions::kInstallFlagNone, &error_1)); |
242 EXPECT_EQ(base::string16(), error_1); | 244 EXPECT_EQ(base::string16(), error_1); |
243 | 245 |
244 base::string16 error_2; | 246 base::string16 error_2; |
245 EXPECT_TRUE( | 247 EXPECT_TRUE( |
246 supervised_user_service->UserMayModifySettings(extension.get(), | 248 supervised_user_service->UserMayModifySettings(extension.get(), |
247 &error_2)); | 249 &error_2)); |
248 EXPECT_EQ(base::string16(), error_2); | 250 EXPECT_EQ(base::string16(), error_2); |
249 } | 251 } |
250 | 252 |
251 TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) { | 253 TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) { |
252 SupervisedUserService* supervised_user_service = | 254 SupervisedUserService* supervised_user_service = |
253 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | 255 SupervisedUserServiceFactory::GetForProfile(profile_.get()); |
254 SupervisedUserURLFilterObserver observer( | 256 SupervisedUserURLFilterObserver observer( |
255 supervised_user_service->GetURLFilterForUIThread()); | 257 supervised_user_service->GetURLFilterForUIThread()); |
256 ASSERT_TRUE(profile_->IsSupervised()); | 258 ASSERT_TRUE(profile_->IsSupervised()); |
257 // Wait for the initial update to finish (otherwise we'll get leaks). | 259 // Wait for the initial update to finish (otherwise we'll get leaks). |
258 observer.Wait(); | 260 observer.Wait(); |
259 | 261 |
260 // Check that a supervised user can install a theme. | 262 // Check that a supervised user can install a theme. |
261 scoped_refptr<extensions::Extension> theme = MakeThemeExtension(); | 263 scoped_refptr<extensions::Extension> theme = MakeThemeExtension(); |
262 base::string16 error_1; | 264 base::string16 error_1; |
263 EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1)); | 265 EXPECT_TRUE(supervised_user_service->UserMayLoad( |
| 266 theme.get(), extensions::kInstallFlagNone, &error_1)); |
264 EXPECT_TRUE(error_1.empty()); | 267 EXPECT_TRUE(error_1.empty()); |
265 EXPECT_TRUE( | 268 EXPECT_TRUE( |
266 supervised_user_service->UserMayModifySettings(theme.get(), &error_1)); | 269 supervised_user_service->UserMayModifySettings(theme.get(), &error_1)); |
267 EXPECT_TRUE(error_1.empty()); | 270 EXPECT_TRUE(error_1.empty()); |
268 | 271 |
269 // Now check a different kind of extension. | 272 // Now check a different kind of extension. |
270 scoped_refptr<extensions::Extension> extension = MakeExtension(); | 273 scoped_refptr<extensions::Extension> extension = MakeExtension(); |
271 EXPECT_FALSE(supervised_user_service->UserMayLoad(extension.get(), &error_1)); | 274 EXPECT_FALSE(supervised_user_service->UserMayLoad( |
| 275 extension.get(), extensions::kInstallFlagNone, &error_1)); |
272 EXPECT_FALSE(error_1.empty()); | 276 EXPECT_FALSE(error_1.empty()); |
273 | 277 |
274 base::string16 error_2; | 278 base::string16 error_2; |
275 EXPECT_FALSE( | 279 EXPECT_FALSE( |
276 supervised_user_service->UserMayModifySettings(extension.get(), | 280 supervised_user_service->UserMayModifySettings(extension.get(), |
277 &error_2)); | 281 &error_2)); |
278 EXPECT_FALSE(error_2.empty()); | 282 EXPECT_FALSE(error_2.empty()); |
279 | 283 |
280 #ifndef NDEBUG | 284 #ifndef NDEBUG |
281 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); | 285 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 site_lists[0]->GetSites(&sites); | 402 site_lists[0]->GetSites(&sites); |
399 ASSERT_EQ(1u, sites.size()); | 403 ASSERT_EQ(1u, sites.size()); |
400 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); | 404 EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name); |
401 | 405 |
402 EXPECT_EQ(SupervisedUserURLFilter::WARN, | 406 EXPECT_EQ(SupervisedUserURLFilter::WARN, |
403 url_filter->GetFilteringBehaviorForURL(example_url)); | 407 url_filter->GetFilteringBehaviorForURL(example_url)); |
404 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 408 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
405 url_filter->GetFilteringBehaviorForURL(moose_url)); | 409 url_filter->GetFilteringBehaviorForURL(moose_url)); |
406 } | 410 } |
407 #endif // !defined(OS_ANDROID) | 411 #endif // !defined(OS_ANDROID) |
OLD | NEW |