diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 12:39:04 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 12:39:04 +0000 |
| commit | 4a0cce63feb00d0b14044adbc014092b1b106c1a (patch) | |
| tree | 7364948118d2df6b18a75a79ff3560ba0c6feabf | |
| parent | cc12a71fb13c425856564f56f4e7895eb14f1f5b (diff) | |
| download | chromium_src-4a0cce63feb00d0b14044adbc014092b1b106c1a.zip chromium_src-4a0cce63feb00d0b14044adbc014092b1b106c1a.tar.gz chromium_src-4a0cce63feb00d0b14044adbc014092b1b106c1a.tar.bz2 | |
Fix ToDos, remove suppressions
Followup for https://chromiumcodereview.appspot.com/11618036
BUG=167048
TBR=derat@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11660005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174382 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/wm/session_state_controller_impl2_unittest.cc | 6 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 24 |
2 files changed, 3 insertions, 27 deletions
diff --git a/ash/wm/session_state_controller_impl2_unittest.cc b/ash/wm/session_state_controller_impl2_unittest.cc index 5747802..bb35f0a 100644 --- a/ash/wm/session_state_controller_impl2_unittest.cc +++ b/ash/wm/session_state_controller_impl2_unittest.cc @@ -111,7 +111,7 @@ class SessionStateControllerImpl2Test : public AshTestBase { // We would control animations in a fine way: ui::LayerAnimator::set_disable_animations_for_test(false); - //TODO(antrim) : restore + // TODO(antrim) : restore // animator_helper_ = ui::test::CreateLayerAnimatorHelperForTest(); // Temporary disable animations so that observer is always called, and @@ -135,7 +135,7 @@ class SessionStateControllerImpl2Test : public AshTestBase { } void TearDown() { - //TODO(antrim) : restore + // TODO(antrim) : restore // animator_helper_->AdvanceUntilDone(); AshTestBase::TearDown(); } @@ -397,7 +397,7 @@ class SessionStateControllerImpl2Test : public AshTestBase { scoped_ptr<SessionStateControllerImpl2::TestApi> test_api_; scoped_ptr<SessionStateAnimator::TestApi> animator_api_; - //TODO(antrim) : restore + // TODO(antrim) : restore // scoped_ptr<ui::test::AnimationContainerTestHelper> animator_helper_; private: diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 53ec7c5..4cadde4 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1644,30 +1644,6 @@ fun:ash::AcceleratorController::AcceleratorPressed } { - bug_167048_a - Heapcheck:Leak - ... - fun:ash::SessionStateControllerImpl2::*PreLockAnimation - fun:ash::SessionStateControllerImpl2::*LockAnimation - fun:ash::PowerButtonController::On*ButtonEvent - fun:ash::test::SessionStateControllerImpl2Test::*Button -} -{ - bug_167048_b - Heapcheck:Leak - ... - fun:ash::SessionStateControllerImpl2::StartPostLockAnimation - fun:ash::SessionStateControllerImpl2::OnLockStateChanged - fun:ash::test::SessionStateControllerImpl2Test::SystemLocks -} -{ - bug_167048_c - Heapcheck:Leak - ... - fun:ash::SessionStateControllerImpl2::StartImmediatePreLockAnimation - fun:ash::SessionStateControllerImpl2::OnStartingLock -} -{ bug_167165 Heapcheck:Leak ... |