| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "base/metrics/field_trial.h" | 12 #include "base/metrics/field_trial.h" |
| 13 #include "base/test/mock_entropy_provider.h" | 13 #include "base/test/mock_entropy_provider.h" |
| 14 #include "chrome/browser/extensions/component_loader.h" | 14 #include "chrome/browser/extensions/component_loader.h" |
| 15 #include "chrome/browser/extensions/extension_service.h" | 15 #include "chrome/browser/extensions/extension_service.h" |
| 16 #include "chrome/browser/extensions/extension_service_test_with_install.h" | 16 #include "chrome/browser/extensions/extension_service_test_with_install.h" |
| 17 #include "chrome/browser/extensions/extension_sync_data.h" | 17 #include "chrome/browser/extensions/extension_sync_data.h" |
| 18 #include "chrome/browser/extensions/extension_sync_service.h" | 18 #include "chrome/browser/extensions/extension_sync_service.h" |
| 19 #include "chrome/browser/extensions/extension_util.h" | 19 #include "chrome/browser/extensions/extension_util.h" |
| 20 #include "chrome/browser/extensions/updater/extension_updater.h" | 20 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 21 #include "chrome/browser/sync/profile_sync_service.h" | |
| 22 #include "chrome/browser/sync/profile_sync_service_factory.h" | 21 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 23 #include "chrome/common/chrome_constants.h" | 22 #include "chrome/common/chrome_constants.h" |
| 24 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
| 25 #include "chrome/common/extensions/sync_helper.h" | 24 #include "chrome/common/extensions/sync_helper.h" |
| 26 #include "chrome/test/base/testing_profile.h" | 25 #include "chrome/test/base/testing_profile.h" |
| 26 #include "components/browser_sync/browser/profile_sync_service.h" |
| 27 #include "components/crx_file/id_util.h" | 27 #include "components/crx_file/id_util.h" |
| 28 #include "extensions/browser/app_sorting.h" | 28 #include "extensions/browser/app_sorting.h" |
| 29 #include "extensions/browser/extension_prefs.h" | 29 #include "extensions/browser/extension_prefs.h" |
| 30 #include "extensions/browser/extension_registry.h" | 30 #include "extensions/browser/extension_registry.h" |
| 31 #include "extensions/browser/extension_system.h" | 31 #include "extensions/browser/extension_system.h" |
| 32 #include "extensions/browser/management_policy.h" | 32 #include "extensions/browser/management_policy.h" |
| 33 #include "extensions/browser/test_management_policy.h" | 33 #include "extensions/browser/test_management_policy.h" |
| 34 #include "extensions/common/constants.h" | 34 #include "extensions/common/constants.h" |
| 35 #include "extensions/common/extension_builder.h" | 35 #include "extensions/common/extension_builder.h" |
| 36 #include "extensions/common/manifest_url_handlers.h" | 36 #include "extensions/common/manifest_url_handlers.h" |
| (...skipping 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1761 | 1761 |
| 1762 extension_sync_service()->ProcessSyncChanges(FROM_HERE, change_list); | 1762 extension_sync_service()->ProcessSyncChanges(FROM_HERE, change_list); |
| 1763 | 1763 |
| 1764 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id)); | 1764 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id)); |
| 1765 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); | 1765 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); |
| 1766 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile())); | 1766 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile())); |
| 1767 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); | 1767 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); |
| 1768 } | 1768 } |
| 1769 | 1769 |
| 1770 #endif // defined(ENABLE_SUPERVISED_USERS) | 1770 #endif // defined(ENABLE_SUPERVISED_USERS) |
| OLD | NEW |