| 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> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "components/version_info/version_info.h" | 37 #include "components/version_info/version_info.h" |
| 38 #include "content/public/test/test_browser_thread_bundle.h" | 38 #include "content/public/test/test_browser_thread_bundle.h" |
| 39 #include "content/public/test/test_utils.h" | 39 #include "content/public/test/test_utils.h" |
| 40 #include "testing/gtest/include/gtest/gtest.h" | 40 #include "testing/gtest/include/gtest/gtest.h" |
| 41 | 41 |
| 42 #if defined(ENABLE_EXTENSIONS) | 42 #if defined(ENABLE_EXTENSIONS) |
| 43 #include "chrome/browser/extensions/extension_service.h" | 43 #include "chrome/browser/extensions/extension_service.h" |
| 44 #include "chrome/browser/extensions/extension_service_test_base.h" | 44 #include "chrome/browser/extensions/extension_service_test_base.h" |
| 45 #include "chrome/browser/extensions/extension_util.h" | 45 #include "chrome/browser/extensions/extension_util.h" |
| 46 #include "chrome/browser/extensions/unpacked_installer.h" | 46 #include "chrome/browser/extensions/unpacked_installer.h" |
| 47 #include "chrome/common/extensions/features/feature_channel.h" | |
| 48 #include "extensions/common/extension.h" | 47 #include "extensions/common/extension.h" |
| 49 #include "extensions/common/extension_builder.h" | 48 #include "extensions/common/extension_builder.h" |
| 49 #include "extensions/common/features/feature_channel.h" |
| 50 #include "extensions/common/manifest_constants.h" | 50 #include "extensions/common/manifest_constants.h" |
| 51 | 51 |
| 52 using extensions::Extension; | 52 using extensions::Extension; |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 using content::MessageLoopRunner; | 55 using content::MessageLoopRunner; |
| 56 | 56 |
| 57 namespace { | 57 namespace { |
| 58 | 58 |
| 59 #if !defined(OS_ANDROID) | 59 #if !defined(OS_ANDROID) |
| (...skipping 616 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 |