Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/extensions/extension_crash_recovery_browsertest.cc

Issue 6675033: Fix DCHECK in infobar animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added InvalidateLayout calls to animation and target_height changes. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_infobar_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/extensions/crashed_extension_infobar.h" 6 #include "chrome/browser/extensions/crashed_extension_infobar.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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 346
347 { 347 {
348 SCOPED_TRACE("second infobar"); 348 SCOPED_TRACE("second infobar");
349 AcceptInfoBar(0); 349 AcceptInfoBar(0);
350 CheckExtensionConsistency(size_before); 350 CheckExtensionConsistency(size_before);
351 CheckExtensionConsistency(size_before + 1); 351 CheckExtensionConsistency(size_before + 1);
352 } 352 }
353 } 353 }
354 354
355 // Occassional crashes. See http://crbug.com75450 355 // Occassional crashes. See http://crbug.com75450
356 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, 356 IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) {
357 DISABLED_TwoExtensionsOneByOne) {
358 const size_t size_before = GetExtensionService()->extensions()->size(); 357 const size_t size_before = GetExtensionService()->extensions()->size();
359 LoadTestExtension(); 358 LoadTestExtension();
360 CrashExtension(size_before); 359 CrashExtension(size_before);
361 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); 360 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
362 LoadSecondExtension(); 361 LoadSecondExtension();
363 CrashExtension(size_before); 362 CrashExtension(size_before);
364 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); 363 ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
365 364
366 { 365 {
367 SCOPED_TRACE("first infobar"); 366 SCOPED_TRACE("first infobar");
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 LoadSecondExtension(); 465 LoadSecondExtension();
467 CrashExtension(size_before); 466 CrashExtension(size_before);
468 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); 467 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
469 ASSERT_EQ(crash_size_before + 1, 468 ASSERT_EQ(crash_size_before + 1,
470 GetExtensionService()->terminated_extensions()->size()); 469 GetExtensionService()->terminated_extensions()->size());
471 470
472 GetExtensionService()->UnloadAllExtensions(); 471 GetExtensionService()->UnloadAllExtensions();
473 ASSERT_EQ(crash_size_before, 472 ASSERT_EQ(crash_size_before,
474 GetExtensionService()->terminated_extensions()->size()); 473 GetExtensionService()->terminated_extensions()->size());
475 } 474 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_infobar_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698