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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 #include "content/public/browser/plugin_service.h" | 100 #include "content/public/browser/plugin_service.h" |
101 #include "content/public/browser/render_process_host.h" | 101 #include "content/public/browser/render_process_host.h" |
102 #include "content/public/browser/storage_partition.h" | 102 #include "content/public/browser/storage_partition.h" |
103 #include "content/public/common/content_constants.h" | 103 #include "content/public/common/content_constants.h" |
104 #include "content/public/test/test_browser_thread_bundle.h" | 104 #include "content/public/test/test_browser_thread_bundle.h" |
105 #include "content/public/test/test_utils.h" | 105 #include "content/public/test/test_utils.h" |
106 #include "extensions/browser/extension_dialog_auto_confirm.h" | 106 #include "extensions/browser/extension_dialog_auto_confirm.h" |
107 #include "extensions/browser/extension_prefs.h" | 107 #include "extensions/browser/extension_prefs.h" |
108 #include "extensions/browser/extension_registry.h" | 108 #include "extensions/browser/extension_registry.h" |
109 #include "extensions/browser/extension_system.h" | 109 #include "extensions/browser/extension_system.h" |
| 110 #include "extensions/browser/extension_util.h" |
110 #include "extensions/browser/external_install_info.h" | 111 #include "extensions/browser/external_install_info.h" |
111 #include "extensions/browser/external_provider_interface.h" | 112 #include "extensions/browser/external_provider_interface.h" |
112 #include "extensions/browser/install_flag.h" | 113 #include "extensions/browser/install_flag.h" |
113 #include "extensions/browser/management_policy.h" | 114 #include "extensions/browser/management_policy.h" |
114 #include "extensions/browser/test_extension_registry_observer.h" | 115 #include "extensions/browser/test_extension_registry_observer.h" |
115 #include "extensions/browser/test_management_policy.h" | 116 #include "extensions/browser/test_management_policy.h" |
116 #include "extensions/browser/uninstall_reason.h" | 117 #include "extensions/browser/uninstall_reason.h" |
117 #include "extensions/common/constants.h" | 118 #include "extensions/common/constants.h" |
118 #include "extensions/common/extension.h" | 119 #include "extensions/common/extension.h" |
119 #include "extensions/common/extension_builder.h" | 120 #include "extensions/common/extension_builder.h" |
(...skipping 7076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7196 shared_module->manifest()->type()); | 7197 shared_module->manifest()->type()); |
7197 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 7198 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
7198 | 7199 |
7199 // Reload the extension and wait for it to complete. This previously crashed | 7200 // Reload the extension and wait for it to complete. This previously crashed |
7200 // (see crbug.com/676815). | 7201 // (see crbug.com/676815). |
7201 service()->ReloadExtension(kExtensionId); | 7202 service()->ReloadExtension(kExtensionId); |
7202 base::RunLoop().RunUntilIdle(); | 7203 base::RunLoop().RunUntilIdle(); |
7203 // The shared module should be enabled. | 7204 // The shared module should be enabled. |
7204 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 7205 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
7205 } | 7206 } |
OLD | NEW |