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

Side by Side Diff: ash/mus/test/wm_test_base.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/test/wm_test_base.h" 5 #include "ash/mus/test/wm_test_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/mus/bridge/wm_window_mus_test_api.h" 10 #include "ash/mus/bridge/wm_window_mus_test_api.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 NOTREACHED(); 51 NOTREACHED();
52 return ui::mojom::WindowType::CONTROL; 52 return ui::mojom::WindowType::CONTROL;
53 } 53 }
54 54
55 } // namespace 55 } // namespace
56 56
57 WmTestBase::WmTestBase() {} 57 WmTestBase::WmTestBase() {}
58 58
59 WmTestBase::~WmTestBase() { 59 WmTestBase::~WmTestBase() {
60 CHECK(setup_called_) 60 // You have overridden SetUp but never called WmTestBase::SetUp
61 << "You have overridden SetUp but never called WmTestBase::SetUp"; 61 CHECK(setup_called_);
62 CHECK(teardown_called_) 62 // You have overridden TearDown but never called WmTestBase::TearDown
63 << "You have overridden TearDown but never called WmTestBase::TearDown"; 63 CHECK(teardown_called_);
64 } 64 }
65 65
66 bool WmTestBase::SupportsMultipleDisplays() const { 66 bool WmTestBase::SupportsMultipleDisplays() const {
67 return true; 67 return true;
68 } 68 }
69 69
70 void WmTestBase::UpdateDisplay(const std::string& display_spec) { 70 void WmTestBase::UpdateDisplay(const std::string& display_spec) {
71 test_helper_->UpdateDisplay(display_spec); 71 test_helper_->UpdateDisplay(display_spec);
72 } 72 }
73 73
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 void WmTestBase::TearDown() { 169 void WmTestBase::TearDown() {
170 teardown_called_ = true; 170 teardown_called_ = true;
171 test_helper_.reset(); 171 test_helper_.reset();
172 minimum_size_lock_.reset(); 172 minimum_size_lock_.reset();
173 zero_duration_mode_.reset(); 173 zero_duration_mode_.reset();
174 } 174 }
175 175
176 } // namespace mus 176 } // namespace mus
177 } // namespace ash 177 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698