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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
OLDNEW
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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 GetExtensionService()->terminated_extensions()->size(); 500 GetExtensionService()->terminated_extensions()->size();
501 LoadTestExtension(); 501 LoadTestExtension();
502 LoadSecondExtension(); 502 LoadSecondExtension();
503 CrashExtension(first_extension_id_); 503 CrashExtension(first_extension_id_);
504 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); 504 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
505 ASSERT_EQ(crash_size_before + 1, 505 ASSERT_EQ(crash_size_before + 1,
506 GetExtensionService()->terminated_extensions()->size()); 506 GetExtensionService()->terminated_extensions()->size());
507 507
508 ASSERT_EQ(1U, CountBalloons()); 508 ASSERT_EQ(1U, CountBalloons());
509 UninstallExtension(first_extension_id_); 509 UninstallExtension(first_extension_id_);
510 MessageLoop::current()->RunUntilIdle(); 510 base::MessageLoop::current()->RunUntilIdle();
511 511
512 SCOPED_TRACE("after uninstalling"); 512 SCOPED_TRACE("after uninstalling");
513 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); 513 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
514 ASSERT_EQ(crash_size_before, 514 ASSERT_EQ(crash_size_before,
515 GetExtensionService()->terminated_extensions()->size()); 515 GetExtensionService()->terminated_extensions()->size());
516 ASSERT_EQ(0U, CountBalloons()); 516 ASSERT_EQ(0U, CountBalloons());
517 } 517 }
518 518
519 // http://crbug.com/84719 519 // http://crbug.com/84719
520 #if defined(OS_LINUX) 520 #if defined(OS_LINUX)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 GetController())); 582 GetController()));
583 chrome::Reload(browser(), CURRENT_TAB); 583 chrome::Reload(browser(), CURRENT_TAB);
584 observer.Wait(); 584 observer.Wait();
585 } 585 }
586 // Extension should now be loaded. 586 // Extension should now be loaded.
587 SCOPED_TRACE("after reloading the tab"); 587 SCOPED_TRACE("after reloading the tab");
588 CheckExtensionConsistency(first_extension_id_); 588 CheckExtensionConsistency(first_extension_id_);
589 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size()); 589 ASSERT_EQ(size_before + 1, GetExtensionService()->extensions()->size());
590 ASSERT_EQ(0U, CountBalloons()); 590 ASSERT_EQ(0U, CountBalloons());
591 } 591 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698