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 "apps/app_restore_service.h" | 5 #include "apps/app_restore_service.h" |
6 #include "apps/app_restore_service_factory.h" | 6 #include "apps/app_restore_service_factory.h" |
7 #include "apps/saved_files_service.h" | 7 #include "apps/saved_files_service.h" |
8 #include "base/threading/thread_restrictions.h" | 8 #include "base/threading/thread_restrictions.h" |
9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/extensions/api/file_system/file_system_api.h" | 10 #include "chrome/browser/extensions/api/file_system/file_system_api.h" |
11 #include "content/public/browser/browser_context.h" | 11 #include "content/public/browser/browser_context.h" |
12 #include "content/public/browser/notification_service.h" | 12 #include "content/public/browser/notification_service.h" |
13 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
| 14 #include "extensions/browser/api/file_system/saved_file_entry.h" |
14 #include "extensions/browser/extension_prefs.h" | 15 #include "extensions/browser/extension_prefs.h" |
15 #include "extensions/browser/notification_types.h" | 16 #include "extensions/browser/notification_types.h" |
16 #include "extensions/common/extension.h" | 17 #include "extensions/common/extension.h" |
17 #include "extensions/test/extension_test_message_listener.h" | 18 #include "extensions/test/extension_test_message_listener.h" |
18 | 19 |
19 using extensions::Extension; | 20 using extensions::Extension; |
20 using extensions::ExtensionPrefs; | 21 using extensions::ExtensionPrefs; |
21 using extensions::ExtensionSystem; | 22 using extensions::ExtensionSystem; |
22 using extensions::FileSystemChooseEntryFunction; | 23 using extensions::FileSystemChooseEntryFunction; |
| 24 using extensions::SavedFileEntry; |
23 | 25 |
24 // TODO(benwells): Move PlatformAppBrowserTest to apps namespace in apps | 26 // TODO(benwells): Move PlatformAppBrowserTest to apps namespace in apps |
25 // component. | 27 // component. |
26 using extensions::PlatformAppBrowserTest; | 28 using extensions::PlatformAppBrowserTest; |
27 | 29 |
28 namespace apps { | 30 namespace apps { |
29 | 31 |
30 // Tests that a running app is recorded in the preferences as such. | 32 // Tests that a running app is recorded in the preferences as such. |
31 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, RunningAppsAreRecorded) { | 33 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, RunningAppsAreRecorded) { |
32 content::WindowedNotificationObserver extension_suspended( | 34 content::WindowedNotificationObserver extension_suspended( |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 extension->id(), it->id, it->path, it->is_directory); | 193 extension->id(), it->id, it->path, it->is_directory); |
192 } | 194 } |
193 | 195 |
194 apps::AppRestoreServiceFactory::GetForBrowserContext(browser()->profile()) | 196 apps::AppRestoreServiceFactory::GetForBrowserContext(browser()->profile()) |
195 ->HandleStartup(true); | 197 ->HandleStartup(true); |
196 | 198 |
197 access_ok_listener.WaitUntilSatisfied(); | 199 access_ok_listener.WaitUntilSatisfied(); |
198 } | 200 } |
199 | 201 |
200 } // namespace apps | 202 } // namespace apps |
OLD | NEW |