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 10 matching lines...) Expand all Loading... |
21 #include "base/files/file_enumerator.h" | 21 #include "base/files/file_enumerator.h" |
22 #include "base/files/file_util.h" | 22 #include "base/files/file_util.h" |
23 #include "base/files/scoped_temp_dir.h" | 23 #include "base/files/scoped_temp_dir.h" |
24 #include "base/json/json_file_value_serializer.h" | 24 #include "base/json/json_file_value_serializer.h" |
25 #include "base/json/json_reader.h" | 25 #include "base/json/json_reader.h" |
26 #include "base/json/json_string_value_serializer.h" | 26 #include "base/json/json_string_value_serializer.h" |
27 #include "base/location.h" | 27 #include "base/location.h" |
28 #include "base/macros.h" | 28 #include "base/macros.h" |
29 #include "base/memory/ptr_util.h" | 29 #include "base/memory/ptr_util.h" |
30 #include "base/memory/weak_ptr.h" | 30 #include "base/memory/weak_ptr.h" |
| 31 #include "base/message_loop/message_loop.h" |
31 #include "base/run_loop.h" | 32 #include "base/run_loop.h" |
32 #include "base/single_thread_task_runner.h" | 33 #include "base/single_thread_task_runner.h" |
33 #include "base/stl_util.h" | 34 #include "base/stl_util.h" |
34 #include "base/strings/pattern.h" | 35 #include "base/strings/pattern.h" |
35 #include "base/strings/string16.h" | 36 #include "base/strings/string16.h" |
36 #include "base/strings/string_number_conversions.h" | 37 #include "base/strings/string_number_conversions.h" |
37 #include "base/strings/string_util.h" | 38 #include "base/strings/string_util.h" |
38 #include "base/strings/utf_string_conversions.h" | 39 #include "base/strings/utf_string_conversions.h" |
39 #include "base/threading/thread_task_runner_handle.h" | 40 #include "base/threading/thread_task_runner_handle.h" |
40 #include "base/values.h" | 41 #include "base/values.h" |
(...skipping 6917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6958 shared_module->manifest()->type()); | 6959 shared_module->manifest()->type()); |
6959 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 6960 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
6960 | 6961 |
6961 // Reload the extension and wait for it to complete. This previously crashed | 6962 // Reload the extension and wait for it to complete. This previously crashed |
6962 // (see crbug.com/676815). | 6963 // (see crbug.com/676815). |
6963 service()->ReloadExtension(kExtensionId); | 6964 service()->ReloadExtension(kExtensionId); |
6964 base::RunLoop().RunUntilIdle(); | 6965 base::RunLoop().RunUntilIdle(); |
6965 // The shared module should be enabled. | 6966 // The shared module should be enabled. |
6966 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); | 6967 EXPECT_TRUE(registry()->enabled_extensions().Contains(kExtensionId)); |
6967 } | 6968 } |
OLD | NEW |