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

ui/views/test/views_test_base.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #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;
 
 // A base class for views unit test. It creates a message loop necessary
 // to drive UI events and takes care of OLE initialization for windows.
 class ViewsTestBase : public testing::Test {
  public:
   ViewsTestBase();
   virtual ~ViewsTestBase();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   void RunPendingMessages();
 
  protected:
   TestViewsDelegate& views_delegate() const { return *views_delegate_.get(); }
 
   void set_views_delegate(TestViewsDelegate* views_delegate) {
     views_delegate_.reset(views_delegate);
   }
 
   MessageLoop* message_loop() { return &message_loop_; }
 
  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_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_