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

Unified Diff: trunk/src/ui/views/test/views_test_base.h

Issue 213033002: Revert 259580 "Move wm/public into wm target" (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/ui/views/test/DEPS ('k') | trunk/src/ui/views/test/views_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/test/views_test_base.h
===================================================================
--- trunk/src/ui/views/test/views_test_base.h (revision 259588)
+++ trunk/src/ui/views/test/views_test_base.h (working copy)
@@ -16,7 +16,10 @@
namespace aura {
class WindowTreeHost;
+namespace test {
+class AuraTestHelper;
}
+}
namespace ui {
class EventProcessor;
@@ -24,9 +27,9 @@
namespace wm {
class WMState;
-class WMTestHelper;
}
+
namespace views {
// A base class for views unit test. It creates a message loop necessary
@@ -65,7 +68,7 @@
private:
base::MessageLoopForUI message_loop_;
scoped_ptr<TestViewsDelegate> views_delegate_;
- scoped_ptr<wm::WMTestHelper> wm_test_helper_;
+ scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
scoped_ptr<wm::WMState> wm_state_;
bool setup_called_;
bool teardown_called_;
« no previous file with comments | « trunk/src/ui/views/test/DEPS ('k') | trunk/src/ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698