Get views_unittests pass on touch build

views/test/views_test_base.h

Index: views/test/views_test_base.h
diff --git a/views/test/views_test_base.h b/views/test/views_test_base.h
index 4eb111ac4ae767453700821fbff45e4f8feba7b0..0d27c3f7c45e93674971f11f5c997813374085fc 100644
--- a/views/test/views_test_base.h
+++ b/views/test/views_test_base.h
@@ -9,10 +9,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/message_loop.h"
+#include "base/scoped_ptr.h"
 #include "views/test/test_views_delegate.h"
 
 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 {
@@ -21,18 +24,25 @@ class ViewsTestBase : public testing::Test {
   virtual ~ViewsTestBase();
 
   // testing::Test:
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   void RunPendingMessages() {
     message_loop_.RunAllPending();
   }
 
  protected:
-  TestViewsDelegate& views_delegate() { return views_delegate_; }
+  TestViewsDelegate& views_delegate() const { return *views_delegate_.get(); }
+
+  void set_views_delegate(TestViewsDelegate* views_delegate) {
+    views_delegate_.reset(views_delegate);
+  }
 
  private:
   MessageLoopForUI message_loop_;
-  TestViewsDelegate views_delegate_;
+  scoped_ptr<TestViewsDelegate> views_delegate_;
+  bool setup_called_;
+  bool teardown_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };