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

Unified Diff: ui/views/test/views_test_base.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/test/views_test_base.h ('k') | ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_base.cc
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 7929f9aed1105c4c6cdaa1970ac9fdced056c321..4bf036ce68430e695085b05d72d20a322364389b 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -25,7 +25,7 @@ ViewsTestBase::~ViewsTestBase() {
CHECK(setup_called_)
<< "You have overridden SetUp but never called super class's SetUp";
CHECK(teardown_called_)
- << "You have overrideen TearDown but never called super class's TearDown";
+ << "You have overridden TearDown but never called super class's TearDown";
}
void ViewsTestBase::SetUp() {
@@ -39,7 +39,7 @@ void ViewsTestBase::SetUp() {
aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
aura_test_helper_->SetUp();
- wm_state_.reset(new views::corewm::WMState);
+ wm_state_.reset(new ::wm::WMState);
ui::InitializeInputMethodForTesting();
}
@@ -56,7 +56,7 @@ void ViewsTestBase::TearDown() {
aura_test_helper_->TearDown();
ui::TerminateContextFactoryForTests();
wm_state_.reset();
- CHECK(!corewm::ScopedCaptureClient::IsActive());
+ CHECK(!wm::ScopedCaptureClient::IsActive());
}
void ViewsTestBase::RunPendingMessages() {
« no previous file with comments | « ui/views/test/views_test_base.h ('k') | ui/views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698