| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateBundleTest, | 429 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateBundleTest, |
| 430 InstallBundleCancel) { | 430 InstallBundleCancel) { |
| 431 // We don't need to create the CRX files since we are aborting the install. | 431 // We don't need to create the CRX files since we are aborting the install. |
| 432 extensions::BundleInstaller::SetAutoApproveForTesting(false); | 432 extensions::BundleInstaller::SetAutoApproveForTesting(false); |
| 433 ASSERT_TRUE(RunPageTest(GetTestServerURL( | 433 ASSERT_TRUE(RunPageTest(GetTestServerURL( |
| 434 "install_bundle_cancel.html").spec())); | 434 "install_bundle_cancel.html").spec())); |
| 435 } | 435 } |
| 436 | 436 |
| 437 // Tests partially installing a bundle (2 succeed, 1 fails due to an invalid | 437 // Tests partially installing a bundle (2 succeed, 1 fails due to an invalid |
| 438 // CRX, and 1 fails due to the manifests not matching). | 438 // CRX, and 1 fails due to the manifests not matching). |
| 439 #if defined(OS_WIN) |
| 440 // Times out on Windows. http://crbug.com/238805 |
| 441 #define MAYBE_InstallBundleInvalid DISABLED_InstallBundleInvalid |
| 442 #else |
| 443 #define MAYBE_InstallBundleInvalid InstallBundleInvalid |
| 444 #endif |
| 439 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateBundleTest, | 445 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateBundleTest, |
| 440 InstallBundleInvalid) { | 446 MAYBE_InstallBundleInvalid) { |
| 441 extensions::BundleInstaller::SetAutoApproveForTesting(true); | 447 extensions::BundleInstaller::SetAutoApproveForTesting(true); |
| 442 | 448 |
| 443 PackInvalidCRX("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); | 449 PackInvalidCRX("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); |
| 444 PackCRX("bmfoocgfinpmkmlbjhcbofejhkhlbchk", "extension1.json"); | 450 PackCRX("bmfoocgfinpmkmlbjhcbofejhkhlbchk", "extension1.json"); |
| 445 PackCRX("begfmnajjkbjdgmffnjaojchoncnmngg", "app1.json"); | 451 PackCRX("begfmnajjkbjdgmffnjaojchoncnmngg", "app1.json"); |
| 446 | 452 |
| 447 ASSERT_TRUE(RunPageTest(GetTestServerURL( | 453 ASSERT_TRUE(RunPageTest(GetTestServerURL( |
| 448 "install_bundle_invalid.html").spec())); | 454 "install_bundle_invalid.html").spec())); |
| 449 | 455 |
| 450 ASSERT_TRUE(service()->GetExtensionById( | 456 ASSERT_TRUE(service()->GetExtensionById( |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 content::GpuDataManager::GetInstance()->InitializeForTesting( | 488 content::GpuDataManager::GetInstance()->InitializeForTesting( |
| 483 json_blacklist, gpu_info); | 489 json_blacklist, gpu_info); |
| 484 EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted( | 490 EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted( |
| 485 content::GPU_FEATURE_TYPE_WEBGL)); | 491 content::GPU_FEATURE_TYPE_WEBGL)); |
| 486 | 492 |
| 487 bool webgl_allowed = false; | 493 bool webgl_allowed = false; |
| 488 RunTest(webgl_allowed); | 494 RunTest(webgl_allowed); |
| 489 } | 495 } |
| 490 | 496 |
| 491 } // namespace extensions | 497 } // namespace extensions |
| OLD | NEW |