| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/extensions/extension_service.h" | 5 #include "chrome/browser/extensions/extension_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 #include "chrome/browser/extensions/test_extension_system.h" | 71 #include "chrome/browser/extensions/test_extension_system.h" |
| 72 #include "chrome/browser/extensions/unpacked_installer.h" | 72 #include "chrome/browser/extensions/unpacked_installer.h" |
| 73 #include "chrome/browser/extensions/updater/extension_updater.h" | 73 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 74 #include "chrome/browser/policy/profile_policy_connector.h" | 74 #include "chrome/browser/policy/profile_policy_connector.h" |
| 75 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 75 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
| 76 #include "chrome/browser/ui/global_error/global_error.h" | 76 #include "chrome/browser/ui/global_error/global_error.h" |
| 77 #include "chrome/browser/ui/global_error/global_error_service.h" | 77 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 78 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 78 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 79 #include "chrome/common/chrome_constants.h" | 79 #include "chrome/common/chrome_constants.h" |
| 80 #include "chrome/common/chrome_switches.h" | 80 #include "chrome/common/chrome_switches.h" |
| 81 #include "chrome/common/extensions/api/plugins/plugins_handler.h" | |
| 82 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 81 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 83 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" | 82 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" |
| 84 #include "chrome/common/pref_names.h" | 83 #include "chrome/common/pref_names.h" |
| 85 #include "chrome/common/url_constants.h" | 84 #include "chrome/common/url_constants.h" |
| 86 #include "chrome/grit/browser_resources.h" | 85 #include "chrome/grit/browser_resources.h" |
| 87 #include "chrome/grit/generated_resources.h" | 86 #include "chrome/grit/generated_resources.h" |
| 88 #include "chrome/test/base/scoped_browser_locale.h" | 87 #include "chrome/test/base/scoped_browser_locale.h" |
| 89 #include "chrome/test/base/testing_profile.h" | 88 #include "chrome/test/base/testing_profile.h" |
| 90 #include "components/crx_file/id_util.h" | 89 #include "components/crx_file/id_util.h" |
| 91 #include "components/pref_registry/pref_registry_syncable.h" | 90 #include "components/pref_registry/pref_registry_syncable.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 116 #include "extensions/browser/test_management_policy.h" | 115 #include "extensions/browser/test_management_policy.h" |
| 117 #include "extensions/browser/uninstall_reason.h" | 116 #include "extensions/browser/uninstall_reason.h" |
| 118 #include "extensions/common/constants.h" | 117 #include "extensions/common/constants.h" |
| 119 #include "extensions/common/extension.h" | 118 #include "extensions/common/extension.h" |
| 120 #include "extensions/common/extension_builder.h" | 119 #include "extensions/common/extension_builder.h" |
| 121 #include "extensions/common/extension_l10n_util.h" | 120 #include "extensions/common/extension_l10n_util.h" |
| 122 #include "extensions/common/extension_resource.h" | 121 #include "extensions/common/extension_resource.h" |
| 123 #include "extensions/common/manifest_constants.h" | 122 #include "extensions/common/manifest_constants.h" |
| 124 #include "extensions/common/manifest_handlers/background_info.h" | 123 #include "extensions/common/manifest_handlers/background_info.h" |
| 125 #include "extensions/common/manifest_handlers/permissions_parser.h" | 124 #include "extensions/common/manifest_handlers/permissions_parser.h" |
| 125 #include "extensions/common/manifest_handlers/plugins_handler.h" |
| 126 #include "extensions/common/manifest_url_handlers.h" | 126 #include "extensions/common/manifest_url_handlers.h" |
| 127 #include "extensions/common/permissions/permission_set.h" | 127 #include "extensions/common/permissions/permission_set.h" |
| 128 #include "extensions/common/permissions/permissions_data.h" | 128 #include "extensions/common/permissions/permissions_data.h" |
| 129 #include "extensions/common/switches.h" | 129 #include "extensions/common/switches.h" |
| 130 #include "extensions/common/url_pattern.h" | 130 #include "extensions/common/url_pattern.h" |
| 131 #include "extensions/common/value_builder.h" | 131 #include "extensions/common/value_builder.h" |
| 132 #include "net/cookies/cookie_options.h" | 132 #include "net/cookies/cookie_options.h" |
| 133 #include "net/cookies/cookie_store.h" | 133 #include "net/cookies/cookie_store.h" |
| 134 #include "net/url_request/url_request_context.h" | 134 #include "net/url_request/url_request_context.h" |
| 135 #include "net/url_request/url_request_context_getter.h" | 135 #include "net/url_request/url_request_context_getter.h" |
| (...skipping 7012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7148 shared_module->manifest()->type()); | 7148 shared_module->manifest()->type()); |
| 7149 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 7149 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
| 7150 | 7150 |
| 7151 // Reload the extension and wait for it to complete. This previously crashed | 7151 // Reload the extension and wait for it to complete. This previously crashed |
| 7152 // (see crbug.com/676815). | 7152 // (see crbug.com/676815). |
| 7153 service()->ReloadExtension(kExtensionId); | 7153 service()->ReloadExtension(kExtensionId); |
| 7154 base::RunLoop().RunUntilIdle(); | 7154 base::RunLoop().RunUntilIdle(); |
| 7155 // The shared module should be enabled. | 7155 // The shared module should be enabled. |
| 7156 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 7156 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
| 7157 } | 7157 } |
| OLD | NEW |