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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
13 #include "base/prefs/pref_service.h" | |
14 #include "base/prefs/scoped_user_pref_update.h" | |
15 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
16 #include "base/thread_task_runner_handle.h" | 14 #include "base/thread_task_runner_handle.h" |
17 #include "build/build_config.h" | 15 #include "build/build_config.h" |
18 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
19 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" | 18 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" |
21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 19 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
22 #include "chrome/browser/signin/signin_manager_factory.h" | 20 #include "chrome/browser/signin/signin_manager_factory.h" |
23 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser
vice.h" | 21 #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" | 22 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser
vice_factory.h" |
25 #include "chrome/browser/supervised_user/permission_request_creator.h" | 23 #include "chrome/browser/supervised_user/permission_request_creator.h" |
26 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 24 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
27 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 25 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
28 #include "chrome/browser/ui/browser_list.h" | 26 #include "chrome/browser/ui/browser_list.h" |
29 #include "chrome/common/chrome_paths.h" | 27 #include "chrome/common/chrome_paths.h" |
30 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
31 #include "chrome/test/base/testing_profile.h" | 29 #include "chrome/test/base/testing_profile.h" |
| 30 #include "components/prefs/pref_service.h" |
| 31 #include "components/prefs/scoped_user_pref_update.h" |
32 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" | 32 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" |
33 #include "components/signin/core/browser/signin_manager.h" | 33 #include "components/signin/core/browser/signin_manager.h" |
34 #include "components/version_info/version_info.h" | 34 #include "components/version_info/version_info.h" |
35 #include "content/public/test/test_browser_thread_bundle.h" | 35 #include "content/public/test/test_browser_thread_bundle.h" |
36 #include "content/public/test/test_utils.h" | 36 #include "content/public/test/test_utils.h" |
37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
38 | 38 |
39 #if defined(ENABLE_EXTENSIONS) | 39 #if defined(ENABLE_EXTENSIONS) |
40 #include "chrome/browser/extensions/extension_service.h" | 40 #include "chrome/browser/extensions/extension_service.h" |
41 #include "chrome/browser/extensions/extension_service_test_base.h" | 41 #include "chrome/browser/extensions/extension_service_test_base.h" |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); | 579 EXPECT_EQ(title2, site_list_observer_.site_lists()[0]->title()); |
580 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); | 580 EXPECT_TRUE(site_list_observer_.site_lists()[0]->entry_point().is_empty()); |
581 | 581 |
582 url_filter_observer_.Wait(); | 582 url_filter_observer_.Wait(); |
583 EXPECT_EQ(SupervisedUserURLFilter::WARN, | 583 EXPECT_EQ(SupervisedUserURLFilter::WARN, |
584 url_filter->GetFilteringBehaviorForURL(youtube_url)); | 584 url_filter->GetFilteringBehaviorForURL(youtube_url)); |
585 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, | 585 EXPECT_EQ(SupervisedUserURLFilter::ALLOW, |
586 url_filter->GetFilteringBehaviorForURL(moose_url)); | 586 url_filter->GetFilteringBehaviorForURL(moose_url)); |
587 } | 587 } |
588 #endif // defined(ENABLE_EXTENSIONS) | 588 #endif // defined(ENABLE_EXTENSIONS) |
OLD | NEW |