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 "base/process_util.h" | 5 #include "base/process_util.h" |
6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 } | 473 } |
474 | 474 |
475 { | 475 { |
476 SCOPED_TRACE("second: balloon"); | 476 SCOPED_TRACE("second: balloon"); |
477 ASSERT_NO_FATAL_FAILURE(AcceptNotification(0)); | 477 ASSERT_NO_FATAL_FAILURE(AcceptNotification(0)); |
478 CheckExtensionConsistency(first_extension_id_); | 478 CheckExtensionConsistency(first_extension_id_); |
479 CheckExtensionConsistency(second_extension_id_); | 479 CheckExtensionConsistency(second_extension_id_); |
480 } | 480 } |
481 } | 481 } |
482 | 482 |
483 IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest, CrashAndUninstall) { | 483 // http://crbug.com/243648 |
| 484 #if defined(OS_WIN) |
| 485 #define MAYBE_CrashAndUninstall DISABLED_CrashAndUninstall |
| 486 #else |
| 487 #define MAYBE_CrashAndUninstall CrashAndUninstall |
| 488 #endif |
| 489 IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest, |
| 490 MAYBE_CrashAndUninstall) { |
484 const size_t size_before = GetExtensionService()->extensions()->size(); | 491 const size_t size_before = GetExtensionService()->extensions()->size(); |
485 const size_t crash_size_before = | 492 const size_t crash_size_before = |
486 GetExtensionService()->terminated_extensions()->size(); | 493 GetExtensionService()->terminated_extensions()->size(); |
487 LoadTestExtension(); | 494 LoadTestExtension(); |
488 LoadSecondExtension(); | 495 LoadSecondExtension(); |
489 CrashExtension(first_extension_id_); | 496 CrashExtension(first_extension_id_); |
490 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 497 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
491 ASSERT_EQ(crash_size_before + 1, | 498 ASSERT_EQ(crash_size_before + 1, |
492 GetExtensionService()->terminated_extensions()->size()); | 499 GetExtensionService()->terminated_extensions()->size()); |
493 | 500 |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 GetController())); | 575 GetController())); |
569 chrome::Reload(browser(), CURRENT_TAB); | 576 chrome::Reload(browser(), CURRENT_TAB); |
570 observer.Wait(); | 577 observer.Wait(); |
571 } | 578 } |
572 // Extension should now be loaded. | 579 // Extension should now be loaded. |
573 SCOPED_TRACE("after reloading the tab"); | 580 SCOPED_TRACE("after reloading the tab"); |
574 CheckExtensionConsistency(first_extension_id_); | 581 CheckExtensionConsistency(first_extension_id_); |
575 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 582 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
576 ASSERT_EQ(0U, CountBalloons()); | 583 ASSERT_EQ(0U, CountBalloons()); |
577 } | 584 } |
OLD | NEW |