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/download/download_crx_util.h" | 5 #include "chrome/browser/download/download_crx_util.h" |
6 #include "chrome/browser/download/download_service.h" | 6 #include "chrome/browser/download/download_service.h" |
7 #include "chrome/browser/download/download_service_factory.h" | 7 #include "chrome/browser/download/download_service_factory.h" |
8 #include "chrome/browser/download/download_test_observer.h" | 8 #include "chrome/browser/download/download_test_observer.h" |
9 #include "chrome/browser/extensions/crx_installer.h" | 9 #include "chrome/browser/extensions/crx_installer.h" |
10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes", | 234 EXPECT_NO_FATAL_FAILURE(CheckHasEmptyScopesAfterInstall("browsertest/scopes", |
235 false)); | 235 false)); |
236 } | 236 } |
237 | 237 |
238 // Off-store install cannot yet be disabled on Aura. | 238 // Off-store install cannot yet be disabled on Aura. |
239 #if defined(USE_AURA) | 239 #if defined(USE_AURA) |
240 #define MAYBE_AllowOffStore DISABLED_AllowOffStore | 240 #define MAYBE_AllowOffStore DISABLED_AllowOffStore |
241 #else | 241 #else |
242 #define MAYBE_AllowOffStore AllowOffStore | 242 #define MAYBE_AllowOffStore AllowOffStore |
243 #endif | 243 #endif |
244 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, MAYBE_AllowOffStore) { | 244 // Crashy: http://crbug.com/140893 |
| 245 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, DISABLED_AllowOffStore) { |
245 ExtensionService* service = browser()->profile()->GetExtensionService(); | 246 ExtensionService* service = browser()->profile()->GetExtensionService(); |
246 const bool kTestData[] = {false, true}; | 247 const bool kTestData[] = {false, true}; |
247 | 248 |
248 for (size_t i = 0; i < arraysize(kTestData); ++i) { | 249 for (size_t i = 0; i < arraysize(kTestData); ++i) { |
249 MockInstallPrompt* mock_prompt = | 250 MockInstallPrompt* mock_prompt = |
250 CreateMockInstallPromptForBrowser(browser()); | 251 CreateMockInstallPromptForBrowser(browser()); |
251 scoped_refptr<CrxInstaller> crx_installer( | 252 scoped_refptr<CrxInstaller> crx_installer( |
252 CrxInstaller::Create(service, mock_prompt)); | 253 CrxInstaller::Create(service, mock_prompt)); |
253 crx_installer->set_install_cause( | 254 crx_installer->set_install_cause( |
254 extension_misc::INSTALL_CAUSE_USER_DOWNLOAD); | 255 extension_misc::INSTALL_CAUSE_USER_DOWNLOAD); |
(...skipping 12 matching lines...) Expand all Loading... |
267 EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i]; | 268 EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i]; |
268 } else { | 269 } else { |
269 EXPECT_EQ(l10n_util::GetStringUTF16( | 270 EXPECT_EQ(l10n_util::GetStringUTF16( |
270 IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE), | 271 IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE), |
271 mock_prompt->error()) << kTestData[i]; | 272 mock_prompt->error()) << kTestData[i]; |
272 } | 273 } |
273 } | 274 } |
274 } | 275 } |
275 | 276 |
276 } // namespace extensions | 277 } // namespace extensions |
OLD | NEW |