| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 } | 66 } |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) { | 69 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) { |
| 70 #if !defined(OS_CHROMEOS) | 70 #if !defined(OS_CHROMEOS) |
| 71 // An extension with NPAPI should give a prompt. | 71 // An extension with NPAPI should give a prompt. |
| 72 EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx", | 72 EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx", |
| 73 "hdgllgikmikobbofgnabhfimcfoopgnd")); | 73 "hdgllgikmikobbofgnabhfimcfoopgnd")); |
| 74 #endif // !defined(OS_CHROMEOS) | 74 #endif // !defined(OS_CHROMEOS) |
| 75 } | 75 } |
| 76 |
| 77 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, |
| 78 GalleryInstallGetsExperimental) { |
| 79 InstallExtension(test_data_dir_.AppendASCII("experimental.crx"), 0); |
| 80 InstallExtensionFromWebstore( |
| 81 test_data_dir_.AppendASCII("experimental.crx"), 1); |
| 82 } |
| OLD | NEW |