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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service_unittest.cc

Issue 2004043002: Supervised Users Initiated Installs v2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kid_initiated_install
Patch Set: Response to code review by treib@ Created 4 years, 6 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
OLDNEW
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 "chrome/browser/supervised_user/supervised_user_service.h" 5 #include "chrome/browser/supervised_user/supervised_user_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
22 #include "chrome/browser/signin/signin_manager_factory.h" 22 #include "chrome/browser/signin/signin_manager_factory.h"
23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" 23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"
24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h" 24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice_factory.h"
25 #include "chrome/browser/supervised_user/permission_request_creator.h" 25 #include "chrome/browser/supervised_user/permission_request_creator.h"
26 #include "chrome/browser/supervised_user/supervised_user_features.h"
26 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 27 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
27 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 28 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
28 #include "chrome/browser/ui/browser_list.h" 29 #include "chrome/browser/ui/browser_list.h"
29 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
30 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
31 #include "chrome/test/base/testing_profile.h" 32 #include "chrome/test/base/testing_profile.h"
32 #include "components/prefs/pref_service.h" 33 #include "components/prefs/pref_service.h"
33 #include "components/prefs/scoped_user_pref_update.h" 34 #include "components/prefs/scoped_user_pref_update.h"
34 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 35 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
35 #include "components/signin/core/browser/signin_manager.h" 36 #include "components/signin/core/browser/signin_manager.h"
36 #include "components/version_info/version_info.h" 37 #include "components/version_info/version_info.h"
37 #include "content/public/test/test_browser_thread_bundle.h" 38 #include "content/public/test/test_browser_thread_bundle.h"
38 #include "content/public/test/test_utils.h" 39 #include "content/public/test/test_utils.h"
39 #include "testing/gtest/include/gtest/gtest.h" 40 #include "testing/gtest/include/gtest/gtest.h"
40 41
41 #if defined(ENABLE_EXTENSIONS) 42 #if defined(ENABLE_EXTENSIONS)
42 #include "chrome/browser/extensions/extension_service.h" 43 #include "chrome/browser/extensions/extension_service.h"
43 #include "chrome/browser/extensions/extension_service_test_base.h" 44 #include "chrome/browser/extensions/extension_service_test_base.h"
44 #include "chrome/browser/extensions/unpacked_installer.h" 45 #include "chrome/browser/extensions/unpacked_installer.h"
45 #include "chrome/common/extensions/features/feature_channel.h" 46 #include "chrome/common/extensions/features/feature_channel.h"
46 #include "extensions/common/extension.h" 47 #include "extensions/common/extension.h"
47 #include "extensions/common/extension_builder.h" 48 #include "extensions/common/extension_builder.h"
48 #include "extensions/common/manifest_constants.h" 49 #include "extensions/common/manifest_constants.h"
50
51 using extensions::Extension;
49 #endif 52 #endif
50 53
51 using content::MessageLoopRunner; 54 using content::MessageLoopRunner;
52 55
53 namespace { 56 namespace {
54 57
55 #if !defined(OS_ANDROID) 58 #if !defined(OS_ANDROID)
56 void OnProfileDownloadedFail(const base::string16& full_name) { 59 void OnProfileDownloadedFail(const base::string16& full_name) {
57 ASSERT_TRUE(false) << "Profile download should not have succeeded."; 60 ASSERT_TRUE(false) << "Profile download should not have succeeded.";
58 } 61 }
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // PermissionRequestCreator: 255 // PermissionRequestCreator:
253 bool IsEnabled() const override { return enabled_; } 256 bool IsEnabled() const override { return enabled_; }
254 257
255 void CreateURLAccessRequest(const GURL& url_requested, 258 void CreateURLAccessRequest(const GURL& url_requested,
256 const SuccessCallback& callback) override { 259 const SuccessCallback& callback) override {
257 ASSERT_TRUE(enabled_); 260 ASSERT_TRUE(enabled_);
258 requested_urls_.push_back(url_requested); 261 requested_urls_.push_back(url_requested);
259 callbacks_.push_back(callback); 262 callbacks_.push_back(callback);
260 } 263 }
261 264
265 void CreateExtensionInstallRequest(const std::string& extension_id,
266 const SuccessCallback& callback) override {
267 FAIL();
268 }
269
262 void CreateExtensionUpdateRequest(const std::string& id, 270 void CreateExtensionUpdateRequest(const std::string& id,
263 const SuccessCallback& callback) override { 271 const SuccessCallback& callback) override {
264 FAIL(); 272 FAIL();
265 } 273 }
266 274
267 bool enabled_; 275 bool enabled_;
268 std::vector<GURL> requested_urls_; 276 std::vector<GURL> requested_urls_;
269 std::vector<SuccessCallback> callbacks_; 277 std::vector<SuccessCallback> callbacks_;
270 278
271 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator); 279 DISALLOW_COPY_AND_ASSIGN(MockPermissionRequestCreator);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 public: 437 public:
430 SupervisedUserServiceExtensionTestUnsupervised() 438 SupervisedUserServiceExtensionTestUnsupervised()
431 : SupervisedUserServiceExtensionTestBase(false) {} 439 : SupervisedUserServiceExtensionTestBase(false) {}
432 }; 440 };
433 441
434 class SupervisedUserServiceExtensionTest 442 class SupervisedUserServiceExtensionTest
435 : public SupervisedUserServiceExtensionTestBase { 443 : public SupervisedUserServiceExtensionTestBase {
436 public: 444 public:
437 SupervisedUserServiceExtensionTest() 445 SupervisedUserServiceExtensionTest()
438 : SupervisedUserServiceExtensionTestBase(true) {} 446 : SupervisedUserServiceExtensionTestBase(true) {}
447
448 protected:
449 void InitSupervisedUserInitiatedExtensionInstallFeature(bool enabled) {
450 base::FeatureList::ClearInstanceForTesting();
451 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
452 if (enabled) {
453 feature_list->InitializeFromCommandLine(
454 "SupervisedUserInitiatedExtensionInstall", std::string());
455 }
456 base::FeatureList::SetInstance(std::move(feature_list));
457 }
439 }; 458 };
440 459
441 TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) { 460 TEST_F(SupervisedUserServiceExtensionTest,
461 ExtensionManagementPolicyProviderWithoutSUInitiatedInstalls) {
442 SupervisedUserService* supervised_user_service = 462 SupervisedUserService* supervised_user_service =
443 SupervisedUserServiceFactory::GetForProfile(profile_.get()); 463 SupervisedUserServiceFactory::GetForProfile(profile_.get());
444 ASSERT_TRUE(profile_->IsSupervised()); 464 ASSERT_TRUE(profile_->IsSupervised());
445 465
446 // Check that a supervised user can install and uninstall a theme. 466 // Disable supervised user initiated installs.
467 InitSupervisedUserInitiatedExtensionInstallFeature(false);
468
469 // Check that a supervised user can install and uninstall a theme even if
470 // they are not allowed to install extensions.
447 { 471 {
448 scoped_refptr<extensions::Extension> theme = MakeThemeExtension(); 472 scoped_refptr<extensions::Extension> theme = MakeThemeExtension();
449 473
450 base::string16 error_1; 474 base::string16 error_1;
451 EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1)); 475 EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1));
452 EXPECT_TRUE(error_1.empty()); 476 EXPECT_TRUE(error_1.empty());
453 477
454 base::string16 error_2; 478 base::string16 error_2;
455 EXPECT_FALSE( 479 EXPECT_FALSE(
456 supervised_user_service->MustRemainInstalled(theme.get(), &error_2)); 480 supervised_user_service->MustRemainInstalled(theme.get(), &error_2));
(...skipping 25 matching lines...) Expand all
482 supervised_user_service->MustRemainInstalled(extension.get(), 506 supervised_user_service->MustRemainInstalled(extension.get(),
483 &error_2)); 507 &error_2));
484 EXPECT_FALSE(error_2.empty()); 508 EXPECT_FALSE(error_2.empty());
485 } 509 }
486 510
487 #ifndef NDEBUG 511 #ifndef NDEBUG
488 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty()); 512 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty());
489 #endif 513 #endif
490 } 514 }
491 515
516 TEST_F(SupervisedUserServiceExtensionTest,
517 ExtensionManagementPolicyProviderWithSUInitiatedInstalls) {
518 SupervisedUserService* supervised_user_service =
519 SupervisedUserServiceFactory::GetForProfile(profile_.get());
520 ASSERT_TRUE(profile_->IsSupervised());
521
522 // Enable supervised user initiated installs.
523 InitSupervisedUserInitiatedExtensionInstallFeature(true);
524 // The supervised user should be able to load and uninstall the extensions
525 // they install.
526 {
527 scoped_refptr<extensions::Extension> extension = MakeExtension(false);
528
529 base::string16 error;
530 EXPECT_TRUE(supervised_user_service->UserMayLoad(extension.get(), &error));
531 EXPECT_TRUE(error.empty());
532
533 base::string16 error_2;
534 EXPECT_FALSE(supervised_user_service->MustRemainInstalled(extension.get(),
535 &error_2));
536 EXPECT_TRUE(error_2.empty());
537
538 base::string16 error_3;
539 Extension::DisableReason reason = Extension::DISABLE_NONE;
540 EXPECT_TRUE(supervised_user_service->MustRemainDisabled(extension.get(),
541 &reason,
542 &error_3));
543 EXPECT_EQ(Extension::DISABLE_CUSTODIAN_APPROVAL_REQUIRED, reason);
544 EXPECT_FALSE(error_3.empty());
545
546 base::string16 error_4;
547 EXPECT_TRUE(supervised_user_service->UserMayModifySettings(extension.get(),
548 &error_4));
549 EXPECT_TRUE(error_4.empty());
550 }
551
552 {
553 // A custodian-installed extension may be loaded, but not uninstalled.
554 scoped_refptr<extensions::Extension> extension = MakeExtension(true);
555
556 base::string16 error_1;
557 EXPECT_TRUE(
558 supervised_user_service->UserMayLoad(extension.get(), &error_1));
559 EXPECT_TRUE(error_1.empty());
560
561 base::string16 error_2;
562 EXPECT_TRUE(supervised_user_service->MustRemainInstalled(extension.get(),
563 &error_2));
564 EXPECT_FALSE(error_2.empty());
565
566 base::string16 error_3;
567 Extension::DisableReason reason = Extension::DISABLE_NONE;
568 EXPECT_FALSE(supervised_user_service->MustRemainDisabled(extension.get(),
569 &reason,
570 &error_3));
571 EXPECT_EQ(Extension::DISABLE_NONE, reason);
572 EXPECT_TRUE(error_3.empty());
573
574 base::string16 error_4;
575 EXPECT_FALSE(supervised_user_service->UserMayModifySettings(extension.get(),
576 &error_4));
577 EXPECT_FALSE(error_4.empty());
578 }
579
580 #ifndef NDEBUG
581 EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty());
582 #endif
583 }
584
492 TEST_F(SupervisedUserServiceExtensionTest, NoContentPacks) { 585 TEST_F(SupervisedUserServiceExtensionTest, NoContentPacks) {
493 SupervisedUserService* supervised_user_service = 586 SupervisedUserService* supervised_user_service =
494 SupervisedUserServiceFactory::GetForProfile(profile_.get()); 587 SupervisedUserServiceFactory::GetForProfile(profile_.get());
495 SupervisedUserURLFilter* url_filter = 588 SupervisedUserURLFilter* url_filter =
496 supervised_user_service->GetURLFilterForUIThread(); 589 supervised_user_service->GetURLFilterForUIThread();
497 590
498 // ASSERT_EQ instead of ASSERT_TRUE([...].empty()) so that the error 591 // ASSERT_EQ instead of ASSERT_TRUE([...].empty()) so that the error
499 // message contains the size in case of failure. 592 // message contains the size in case of failure.
500 ASSERT_EQ(0u, site_list_observer_.site_lists().size()); 593 ASSERT_EQ(0u, site_list_observer_.site_lists().size());
501 594
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); 675 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title());
583 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); 676 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty());
584 677
585 url_filter_observer_.Wait(); 678 url_filter_observer_.Wait();
586 EXPECT_EQ(SupervisedUserURLFilter::WARN, 679 EXPECT_EQ(SupervisedUserURLFilter::WARN,
587 url_filter->GetFilteringBehaviorForURL(youtube_url)); 680 url_filter->GetFilteringBehaviorForURL(youtube_url));
588 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, 681 EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
589 url_filter->GetFilteringBehaviorForURL(moose_url)); 682 url_filter->GetFilteringBehaviorForURL(moose_url));
590 } 683 }
591 #endif // defined(ENABLE_EXTENSIONS) 684 #endif // defined(ENABLE_EXTENSIONS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698