| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/extensions/crx_installer.h" | 5 #include "chrome/browser/extensions/crx_installer.h" |
| 6 #include "chrome/browser/extensions/extension_browsertest.h" | 6 #include "chrome/browser/extensions/extension_browsertest.h" |
| 7 #include "chrome/browser/extensions/extension_install_ui.h" | 7 #include "chrome/browser/extensions/extension_install_ui.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 EXPECT_FALSE(InstallExtension(crx_path, 0)); | 108 EXPECT_FALSE(InstallExtension(crx_path, 0)); |
| 109 EXPECT_TRUE(InstallExtensionFromWebstore(crx_path, 1)); | 109 EXPECT_TRUE(InstallExtensionFromWebstore(crx_path, 1)); |
| 110 } | 110 } |
| 111 | 111 |
| 112 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, PlatformAppCrx) { | 112 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, PlatformAppCrx) { |
| 113 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 113 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 114 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 114 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); |
| 115 command_line->AppendSwitch(switches::kEnablePlatformApps); | 115 command_line->AppendSwitch(switches::kEnablePlatformApps); |
| 116 EXPECT_TRUE(InstallExtension( | 116 EXPECT_TRUE(InstallExtension( |
| 117 test_data_dir_.AppendASCII("generic_platform_app.crx"), 1)); | 117 test_data_dir_.AppendASCII("minimal_platform_app.crx"), 1)); |
| 118 } | 118 } |
| OLD | NEW |