OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h" | 9 #include "chrome/browser/extensions/api/system_storage/storage_api_test_util.h" |
10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
11 #include "chrome/browser/extensions/extension_test_message_listener.h" | |
12 #include "components/storage_monitor/storage_monitor.h" | 11 #include "components/storage_monitor/storage_monitor.h" |
13 #include "components/storage_monitor/test_storage_monitor.h" | 12 #include "components/storage_monitor/test_storage_monitor.h" |
14 #include "extensions/browser/api/system_storage/storage_info_provider.h" | 13 #include "extensions/browser/api/system_storage/storage_info_provider.h" |
| 14 #include "extensions/test/extension_test_message_listener.h" |
15 #include "extensions/test/result_catcher.h" | 15 #include "extensions/test/result_catcher.h" |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 using extensions::StorageUnitInfoList; | 19 using extensions::StorageUnitInfoList; |
20 using extensions::test::TestStorageUnitInfo; | 20 using extensions::test::TestStorageUnitInfo; |
21 using extensions::test::kRemovableStorageData; | 21 using extensions::test::kRemovableStorageData; |
22 using storage_monitor::StorageMonitor; | 22 using storage_monitor::StorageMonitor; |
23 using storage_monitor::TestStorageMonitor; | 23 using storage_monitor::TestStorageMonitor; |
24 | 24 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 removable_storage_transient_id, false); | 140 removable_storage_transient_id, false); |
141 | 141 |
142 // Simulate triggering onDetached event. | 142 // Simulate triggering onDetached event. |
143 ASSERT_TRUE(detach_listener.WaitUntilSatisfied()); | 143 ASSERT_TRUE(detach_listener.WaitUntilSatisfied()); |
144 DetachRemovableStorage(kRemovableStorageData.device_id); | 144 DetachRemovableStorage(kRemovableStorageData.device_id); |
145 | 145 |
146 ASSERT_TRUE(detach_device_id_listener.WaitUntilSatisfied()); | 146 ASSERT_TRUE(detach_device_id_listener.WaitUntilSatisfied()); |
147 | 147 |
148 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 148 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
149 } | 149 } |
OLD | NEW |