diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 02:23:29 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 02:23:29 +0000 |
| commit | c2e2b6da588746d381e810a44538694ee6d8d36e (patch) | |
| tree | 2f0676fbd0e504e2fac396834de34fac559816f8 /chrome/browser/extensions/platform_app_browsertest.cc | |
| parent | 31f82edf8844b5d471131603c2d0a53c3dec8a3d (diff) | |
| download | chromium_src-c2e2b6da588746d381e810a44538694ee6d8d36e.zip chromium_src-c2e2b6da588746d381e810a44538694ee6d8d36e.tar.gz chromium_src-c2e2b6da588746d381e810a44538694ee6d8d36e.tar.bz2 | |
Create top level apps component and move some apps code there.
This is a small patch to begin the process of pulling apps code out of chrome and the extensions system.
BUG=159366
Review URL: https://chromiumcodereview.appspot.com/11829055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/platform_app_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest.cc | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 7d0dc46..2e41a90 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -10,8 +10,6 @@ #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/api/permissions/permissions_api.h" -#include "chrome/browser/extensions/app_restore_service.h" -#include "chrome/browser/extensions/app_restore_service_factory.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" @@ -654,37 +652,6 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ASSERT_TRUE(done2_listener.WaitUntilSatisfied()); } -// Tests that a running app is recorded in the preferences as such. -IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, RunningAppsAreRecorded) { - content::WindowedNotificationObserver extension_suspended( - chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED, - content::NotificationService::AllSources()); - - const Extension* extension = LoadExtension( - test_data_dir_.AppendASCII("platform_apps/restart_test")); - ASSERT_TRUE(extension); - ExtensionService* extension_service = - ExtensionSystem::Get(browser()->profile())->extension_service(); - ExtensionPrefs* extension_prefs = extension_service->extension_prefs(); - - // App is running. - ASSERT_TRUE(extension_prefs->IsExtensionRunning(extension->id())); - - // Wait for the extension to get suspended. - extension_suspended.Wait(); - - // App isn't running because it got suspended. - ASSERT_FALSE(extension_prefs->IsExtensionRunning(extension->id())); - - // Pretend that the app is supposed to be running. - extension_prefs->SetExtensionRunning(extension->id(), true); - - ExtensionTestMessageListener restart_listener("onRestarted", false); - AppRestoreServiceFactory::GetForProfile(browser()->profile())-> - HandleStartup(true); - restart_listener.WaitUntilSatisfied(); -} - namespace { class PlatformAppDevToolsBrowserTest : public PlatformAppBrowserTest { |