Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Side by Side Diff: apps/app_restore_service_browsertest.cc

Issue 584513003: Move extension_test_message_listener to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | apps/app_shim/app_shim_interactive_uitest_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/extensions/api/file_system/file_system_api.h" 9 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
10 #include "chrome/browser/extensions/extension_test_message_listener.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
13 #include "content/public/test/test_utils.h" 12 #include "content/public/test/test_utils.h"
14 #include "extensions/browser/extension_prefs.h" 13 #include "extensions/browser/extension_prefs.h"
15 #include "extensions/browser/notification_types.h" 14 #include "extensions/browser/notification_types.h"
16 #include "extensions/common/extension.h" 15 #include "extensions/common/extension.h"
16 #include "extensions/test/extension_test_message_listener.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;
26 26
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 extension->id(), it->id, it->path, it->is_directory); 188 extension->id(), it->id, it->path, it->is_directory);
189 } 189 }
190 190
191 apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())-> 191 apps::AppRestoreServiceFactory::GetForProfile(browser()->profile())->
192 HandleStartup(true); 192 HandleStartup(true);
193 193
194 access_ok_listener.WaitUntilSatisfied(); 194 access_ok_listener.WaitUntilSatisfied();
195 } 195 }
196 196
197 } // namespace apps 197 } // namespace apps
OLDNEW
« no previous file with comments | « no previous file | apps/app_shim/app_shim_interactive_uitest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698