| 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 <stddef.h> |
| 6 |
| 5 #include <vector> | 7 #include <vector> |
| 6 | 8 |
| 9 #include "base/macros.h" |
| 7 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 9 #include "components/storage_monitor/storage_monitor.h" | 12 #include "components/storage_monitor/storage_monitor.h" |
| 10 #include "components/storage_monitor/test_storage_monitor.h" | 13 #include "components/storage_monitor/test_storage_monitor.h" |
| 11 #include "extensions/browser/api/system_storage/storage_api_test_util.h" | 14 #include "extensions/browser/api/system_storage/storage_api_test_util.h" |
| 12 #include "extensions/browser/api/system_storage/storage_info_provider.h" | 15 #include "extensions/browser/api/system_storage/storage_info_provider.h" |
| 13 #include "extensions/shell/test/shell_apitest.h" | 16 #include "extensions/shell/test/shell_apitest.h" |
| 14 #include "extensions/test/extension_test_message_listener.h" | 17 #include "extensions/test/extension_test_message_listener.h" |
| 15 #include "extensions/test/result_catcher.h" | 18 #include "extensions/test/result_catcher.h" |
| 16 | 19 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 removable_storage_transient_id, false); | 141 removable_storage_transient_id, false); |
| 139 | 142 |
| 140 // Simulate triggering onDetached event. | 143 // Simulate triggering onDetached event. |
| 141 ASSERT_TRUE(detach_listener.WaitUntilSatisfied()); | 144 ASSERT_TRUE(detach_listener.WaitUntilSatisfied()); |
| 142 DetachRemovableStorage(kRemovableStorageData.device_id); | 145 DetachRemovableStorage(kRemovableStorageData.device_id); |
| 143 | 146 |
| 144 ASSERT_TRUE(detach_device_id_listener.WaitUntilSatisfied()); | 147 ASSERT_TRUE(detach_device_id_listener.WaitUntilSatisfied()); |
| 145 | 148 |
| 146 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 149 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 147 } | 150 } |
| OLD | NEW |