| 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 "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.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 "chrome/browser/extensions/extension_prefs.h" | |
| 12 #include "chrome/browser/extensions/extension_test_message_listener.h" | 11 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 14 #include "content/public/browser/notification_service.h" | 13 #include "content/public/browser/notification_service.h" |
| 15 #include "content/public/test/test_utils.h" | 14 #include "content/public/test/test_utils.h" |
| 15 #include "extensions/browser/extension_prefs.h" |
| 16 #include "extensions/common/extension.h" | 16 #include "extensions/common/extension.h" |
| 17 | 17 |
| 18 using extensions::Extension; | 18 using extensions::Extension; |
| 19 using extensions::ExtensionPrefs; | 19 using extensions::ExtensionPrefs; |
| 20 using extensions::ExtensionSystem; | 20 using extensions::ExtensionSystem; |
| 21 using extensions::FileSystemChooseEntryFunction; | 21 using extensions::FileSystemChooseEntryFunction; |
| 22 | 22 |
| 23 // TODO(benwells): Move PlatformAppBrowserTest to apps namespace in apps | 23 // TODO(benwells): Move PlatformAppBrowserTest to apps namespace in apps |
| 24 // component. | 24 // component. |
| 25 using extensions::PlatformAppBrowserTest; | 25 using extensions::PlatformAppBrowserTest; |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 extension->id(), it->id, it->path, it->is_directory); | 141 extension->id(), it->id, it->path, it->is_directory); |
| 142 } | 142 } |
| 143 | 143 |
| 144 apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())-> | 144 apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())-> |
| 145 HandleStartup(true); | 145 HandleStartup(true); |
| 146 | 146 |
| 147 access_ok_listener.WaitUntilSatisfied(); | 147 access_ok_listener.WaitUntilSatisfied(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 } // namespace apps | 150 } // namespace apps |
| OLD | NEW |