| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/message_loop/message_loop_proxy.h" | 5 #include "base/message_loop/message_loop_proxy.h" |
| 6 #include "chrome/browser/apps/ephemeral_app_launcher.h" | 6 #include "chrome/browser/apps/ephemeral_app_launcher.h" |
| 7 #include "chrome/browser/apps/ephemeral_app_service.h" | 7 #include "chrome/browser/apps/ephemeral_app_service.h" |
| 8 #include "chrome/browser/extensions/extension_install_checker.h" | 8 #include "chrome/browser/extensions/extension_install_checker.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/install_tracker.h" | 10 #include "chrome/browser/extensions/install_tracker.h" |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 public: | 306 public: |
| 307 void SetUpCommandLine(base::CommandLine* command_line) override { | 307 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 308 // Skip EphemeralAppLauncherTest as it enables the feature. | 308 // Skip EphemeralAppLauncherTest as it enables the feature. |
| 309 WebstoreInstallerTest::SetUpCommandLine(command_line); | 309 WebstoreInstallerTest::SetUpCommandLine(command_line); |
| 310 } | 310 } |
| 311 }; | 311 }; |
| 312 | 312 |
| 313 // Verifies that an ephemeral app will not be installed and launched if the | 313 // Verifies that an ephemeral app will not be installed and launched if the |
| 314 // feature is disabled. | 314 // feature is disabled. |
| 315 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTestDisabled, FeatureDisabled) { | 315 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTestDisabled, FeatureDisabled) { |
| 316 CommandLine::ForCurrentProcess()->AppendSwitch( | 316 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 317 app_list::switches::kDisableExperimentalAppList); | 317 app_list::switches::kDisableExperimentalAppList); |
| 318 RunLaunchTest( | 318 RunLaunchTest( |
| 319 kDefaultAppCrxFilename, webstore_install::LAUNCH_FEATURE_DISABLED, false); | 319 kDefaultAppCrxFilename, webstore_install::LAUNCH_FEATURE_DISABLED, false); |
| 320 EXPECT_FALSE(GetInstalledExtension(kDefaultAppId)); | 320 EXPECT_FALSE(GetInstalledExtension(kDefaultAppId)); |
| 321 } | 321 } |
| 322 | 322 |
| 323 // Verifies that an app with no permission warnings will be installed | 323 // Verifies that an app with no permission warnings will be installed |
| 324 // ephemerally and launched without prompting the user. | 324 // ephemerally and launched without prompting the user. |
| 325 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, | 325 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, |
| 326 LaunchAppWithNoPermissionWarnings) { | 326 LaunchAppWithNoPermissionWarnings) { |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 } | 562 } |
| 563 | 563 |
| 564 // Verifies that a launch will fail if a duplicate launch is in progress. | 564 // Verifies that a launch will fail if a duplicate launch is in progress. |
| 565 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) { | 565 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) { |
| 566 extensions::ActiveInstallData install_data(kDefaultAppId); | 566 extensions::ActiveInstallData install_data(kDefaultAppId); |
| 567 install_data.is_ephemeral = true; | 567 install_data.is_ephemeral = true; |
| 568 InstallTracker::Get(profile())->AddActiveInstall(install_data); | 568 InstallTracker::Get(profile())->AddActiveInstall(install_data); |
| 569 | 569 |
| 570 RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false); | 570 RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false); |
| 571 } | 571 } |
| OLD | NEW |