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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 | 207 |
208 ASSERT_NO_FATAL_FAILURE(CancelNotification(0)); | 208 ASSERT_NO_FATAL_FAILURE(CancelNotification(0)); |
209 ReloadExtension(first_extension_id_); | 209 ReloadExtension(first_extension_id_); |
210 | 210 |
211 SCOPED_TRACE("after reloading"); | 211 SCOPED_TRACE("after reloading"); |
212 CheckExtensionConsistency(first_extension_id_); | 212 CheckExtensionConsistency(first_extension_id_); |
213 ASSERT_EQ(crash_size_before, | 213 ASSERT_EQ(crash_size_before, |
214 GetExtensionService()->terminated_extensions()->size()); | 214 GetExtensionService()->terminated_extensions()->size()); |
215 } | 215 } |
216 | 216 |
217 IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest, ReloadIndependently) { | 217 // Test is timing out on Windows http://crbug.com/174705. |
| 218 #if defined(OS_WIN) |
| 219 #define MAYBE_ReloadIndependently DISABLED_ReloadIndependently |
| 220 #else |
| 221 #define MAYBE_ReloadIndependently ReloadIndependently |
| 222 #endif // defined(OS_WIN) |
| 223 IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest, |
| 224 MAYBE_ReloadIndependently) { |
218 const size_t size_before = GetExtensionService()->extensions()->size(); | 225 const size_t size_before = GetExtensionService()->extensions()->size(); |
219 LoadTestExtension(); | 226 LoadTestExtension(); |
220 CrashExtension(first_extension_id_); | 227 CrashExtension(first_extension_id_); |
221 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); | 228 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); |
222 | 229 |
223 ReloadExtension(first_extension_id_); | 230 ReloadExtension(first_extension_id_); |
224 | 231 |
225 SCOPED_TRACE("after reloading"); | 232 SCOPED_TRACE("after reloading"); |
226 CheckExtensionConsistency(first_extension_id_); | 233 CheckExtensionConsistency(first_extension_id_); |
227 | 234 |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
575 GetController())); | 582 GetController())); |
576 chrome::Reload(browser(), CURRENT_TAB); | 583 chrome::Reload(browser(), CURRENT_TAB); |
577 observer.Wait(); | 584 observer.Wait(); |
578 } | 585 } |
579 // Extension should now be loaded. | 586 // Extension should now be loaded. |
580 SCOPED_TRACE("after reloading the tab"); | 587 SCOPED_TRACE("after reloading the tab"); |
581 CheckExtensionConsistency(first_extension_id_); | 588 CheckExtensionConsistency(first_extension_id_); |
582 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); | 589 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); |
583 ASSERT_EQ(0U, CountBalloons()); | 590 ASSERT_EQ(0U, CountBalloons()); |
584 } | 591 } |
OLD | NEW |