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 "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/test/scoped_feature_list.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 17 #include "base/threading/thread_task_runner_handle.h" |
17 #include "build/build_config.h" | 18 #include "build/build_config.h" |
18 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
19 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 21 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 22 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
22 #include "chrome/browser/signin/signin_manager_factory.h" | 23 #include "chrome/browser/signin/signin_manager_factory.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.h" |
24 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser
vice_factory.h" | 25 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser
vice_factory.h" |
25 #include "chrome/browser/supervised_user/permission_request_creator.h" | 26 #include "chrome/browser/supervised_user/permission_request_creator.h" |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 }; | 442 }; |
442 | 443 |
443 class SupervisedUserServiceExtensionTest | 444 class SupervisedUserServiceExtensionTest |
444 : public SupervisedUserServiceExtensionTestBase { | 445 : public SupervisedUserServiceExtensionTestBase { |
445 public: | 446 public: |
446 SupervisedUserServiceExtensionTest() | 447 SupervisedUserServiceExtensionTest() |
447 : SupervisedUserServiceExtensionTestBase(true) {} | 448 : SupervisedUserServiceExtensionTestBase(true) {} |
448 | 449 |
449 protected: | 450 protected: |
450 void InitSupervisedUserInitiatedExtensionInstallFeature(bool enabled) { | 451 void InitSupervisedUserInitiatedExtensionInstallFeature(bool enabled) { |
451 base::FeatureList::ClearInstanceForTesting(); | |
452 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); | |
453 if (enabled) { | 452 if (enabled) { |
454 feature_list->InitializeFromCommandLine( | 453 scoped_feature_list_.InitAndEnableFeature( |
455 "SupervisedUserInitiatedExtensionInstall", std::string()); | 454 supervised_users::kSupervisedUserInitiatedExtensionInstall); |
456 } | 455 } |
457 base::FeatureList::SetInstance(std::move(feature_list)); | |
458 } | 456 } |
| 457 |
| 458 base::test::ScopedFeatureList scoped_feature_list_; |
459 }; | 459 }; |
460 | 460 |
461 TEST_F(SupervisedUserServiceExtensionTest, | 461 TEST_F(SupervisedUserServiceExtensionTest, |
462 ExtensionManagementPolicyProviderWithoutSUInitiatedInstalls) { | 462 ExtensionManagementPolicyProviderWithoutSUInitiatedInstalls) { |
463 SupervisedUserService* supervised_user_service = | 463 SupervisedUserService* supervised_user_service = |
464 SupervisedUserServiceFactory::GetForProfile(profile_.get()); | 464 SupervisedUserServiceFactory::GetForProfile(profile_.get()); |
465 ASSERT_TRUE(profile_->IsSupervised()); | 465 ASSERT_TRUE(profile_->IsSupervised()); |
466 | 466 |
467 // Disable supervised user initiated installs. | 467 // Disable supervised user initiated installs. |
468 InitSupervisedUserInitiatedExtensionInstallFeature(false); | 468 InitSupervisedUserInitiatedExtensionInstallFeature(false); |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
676 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); | 676 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); |
677 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); | 677 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); |
678 | 678 |
679 url_filter_observer_.Wait(); | 679 url_filter_observer_.Wait(); |
680 EXPECT_EQ(SupervisedUserURLFilter::WARN, | 680 EXPECT_EQ(SupervisedUserURLFilter::WARN, |
681 url_filter->GetFilteringBehaviorForURL(youtube_url)); | 681 url_filter->GetFilteringBehaviorForURL(youtube_url)); |
682 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 682 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
683 url_filter->GetFilteringBehaviorForURL(moose_url)); | 683 url_filter->GetFilteringBehaviorForURL(moose_url)); |
684 } | 684 } |
685 #endif // defined(ENABLE_EXTENSIONS) | 685 #endif // defined(ENABLE_EXTENSIONS) |
OLD | NEW |