Revert 114095 - Move the concept of Activation to the Shell.

ui/views/test/views_test_base.h

Index: ui/views/test/views_test_base.h
===================================================================
--- ui/views/test/views_test_base.h	(revision 114099)
+++ ui/views/test/views_test_base.h	(working copy)
@@ -11,12 +11,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/test/test_views_delegate.h"
 
-namespace aura {
-namespace test {
-class TestActivationClient;
-}
-}
-
 namespace views {
 
 class TestViewsDelegate;
@@ -46,9 +40,6 @@
  private:
   MessageLoopForUI message_loop_;
   scoped_ptr<TestViewsDelegate> views_delegate_;
-#if defined(USE_AURA)
-  scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
-#endif
   bool setup_called_;
   bool teardown_called_;
 
Property changes on: ui\views\test\views_test_base.h
___________________________________________________________________
Added: svn:mergeinfo