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 "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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 } | 364 } |
365 | 365 |
366 { | 366 { |
367 SCOPED_TRACE("second balloon"); | 367 SCOPED_TRACE("second balloon"); |
368 AcceptNotification(0); | 368 AcceptNotification(0); |
369 CheckExtensionConsistency(size_before); | 369 CheckExtensionConsistency(size_before); |
370 CheckExtensionConsistency(size_before + 1); | 370 CheckExtensionConsistency(size_before + 1); |
371 } | 371 } |
372 } | 372 } |
373 | 373 |
374 // Occassional crashes. See http://crbug.com75450 | 374 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) { |
375 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, | |
376 DISABLED_TwoExtensionsOneByOne) { | |
377 const size_t size_before = GetExtensionService()->extensions()->size(); | 375 const size_t size_before = GetExtensionService()->extensions()->size(); |
378 LoadTestExtension(); | 376 LoadTestExtension(); |
379 CrashExtension(size_before); | 377 CrashExtension(size_before); |
380 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); | 378 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); |
381 LoadSecondExtension(); | 379 LoadSecondExtension(); |
382 CrashExtension(size_before); | 380 CrashExtension(size_before); |
383 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); | 381 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); |
384 | 382 |
385 { | 383 { |
386 SCOPED_TRACE("first balloon"); | 384 SCOPED_TRACE("first balloon"); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 LoadSecondExtension(); | 487 LoadSecondExtension(); |
490 CrashExtension(size_before); | 488 CrashExtension(size_before); |
491 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 489 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
492 ASSERT_EQ(crash_size_before + 1, | 490 ASSERT_EQ(crash_size_before + 1, |
493 GetExtensionService()->terminated_extensions()->size()); | 491 GetExtensionService()->terminated_extensions()->size()); |
494 | 492 |
495 GetExtensionService()->UnloadAllExtensions(); | 493 GetExtensionService()->UnloadAllExtensions(); |
496 ASSERT_EQ(crash_size_before, | 494 ASSERT_EQ(crash_size_before, |
497 GetExtensionService()->terminated_extensions()->size()); | 495 GetExtensionService()->terminated_extensions()->size()); |
498 } | 496 } |
OLD | NEW |