Merge 113149 - Reland 112770, but with test disabled.

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"
@@ skipping 17 matching lines @@
 
   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_;
   bool setup_called_;
   bool teardown_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_