views: Move view.h to ui/views/.

views/view_unittest.cc

-// 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.
-
-#include <map>
-
-#include "base/memory/scoped_ptr.h"
-#include "base/rand_util.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/compositor/layer_animator.h"
-#include "ui/gfx/compositor/test/test_compositor.h"
-#include "ui/gfx/compositor/test/test_texture.h"
-#include "ui/gfx/path.h"
-#include "ui/gfx/transform.h"
-#include "ui/views/controls/button/button_dropdown.h"
-#include "ui/views/controls/button/checkbox.h"
-#include "ui/views/controls/native/native_view_host.h"
-#include "ui/views/controls/scroll_view.h"
-#include "ui/views/controls/textfield/textfield.h"
-#include "ui/views/events/event.h"
-#include "ui/views/focus/accelerator_handler.h"
-#include "ui/views/focus/view_storage.h"
-#include "ui/views/test/views_test_base.h"
-#include "ui/views/touchui/gesture_manager.h"
-#include "ui/views/widget/native_widget.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/window/dialog_delegate.h"
-#include "views/background.h"
-#include "views/view.h"
-#include "views/views_delegate.h"
-
-#if defined(OS_WIN)
-#include "ui/views/test/test_views_delegate.h"
-#endif
-#if defined(USE_AURA)
-#include "ui/aura/desktop.h"
-#endif
-
-using ::testing::_;
-
-namespace {
-
-// Returns true if |ancestor| is an ancestor of |layer|.
-bool LayerIsAncestor(const ui::Layer* ancestor, const ui::Layer* layer) {
-  while (layer && layer != ancestor)
-    layer = layer->parent();
-  return layer == ancestor;
-}
-
-// Convenience functions for walking a View tree.
-const views::View* FirstView(const views::View* view) {
-  const views::View* v = view;
-  while (v->has_children())
-    v = v->child_at(0);
-  return v;
-}
-
-const views::View* NextView(const views::View* view) {
-  const views::View* v = view;
-  const views::View* parent = v->parent();
-  if (!parent)
-    return NULL;
-  int next = parent->GetIndexOf(v) + 1;
-  if (next != parent->child_count())
-    return FirstView(parent->child_at(next));
-  return parent;
-}
-
-// Convenience functions for walking a Layer tree.
-const ui::Layer* FirstLayer(const ui::Layer* layer) {
-  const ui::Layer* l = layer;
-  while (l->children().size() > 0)
-    l = l->children()[0];
-  return l;
-}
-
-const ui::Layer* NextLayer(const ui::Layer* layer) {
-  const ui::Layer* parent = layer->parent();
-  if (!parent)
-    return NULL;
-  const std::vector<ui::Layer*> children = parent->children();
-  size_t index;
-  for (index = 0; index < children.size(); index++) {
-    if (children[index] == layer)
-      break;
-  }
-  size_t next = index + 1;
-  if (next < children.size())
-    return FirstLayer(children[next]);
-  return parent;
-}
-
-// Given the root nodes of a View tree and a Layer tree, makes sure the two
-// trees are in sync.
-bool ViewAndLayerTreeAreConsistent(const views::View* view,
-                                   const ui::Layer* layer) {
-  const views::View* v = FirstView(view);
-  const ui::Layer* l = FirstLayer(layer);
-  while (v && l) {
-    // Find the view with a layer.
-    while (v && !v->layer())
-      v = NextView(v);
-    EXPECT_TRUE(v);
-    if (!v)
-      return false;
-
-    // Check if the View tree and the Layer tree are in sync.
-    EXPECT_EQ(l, v->layer());
-    if (v->layer() != l)
-      return false;
-
-    // Check if the visibility states of the View and the Layer are in sync.
-    EXPECT_EQ(l->IsDrawn(), v->IsVisibleInRootView());
-    if (v->IsVisibleInRootView() != l->IsDrawn()) {
-      for (const views::View* vv = v; vv; vv = vv->parent())
-        LOG(ERROR) << "V: " << vv << " " << vv->IsVisible() << " "
-                   << vv->IsVisibleInRootView() << " " << vv->layer();
-      for (const ui::Layer* ll = l; ll; ll = ll->parent())
-        LOG(ERROR) << "L: " << ll << " " << ll->IsDrawn();
-      return false;
-    }
-
-    // Check if the size of the View and the Layer are in sync.
-    EXPECT_EQ(l->bounds(), v->bounds());
-    if (v->bounds() != l->bounds())
-      return false;
-
-    if (v == view || l == layer)
-      return v == view && l == layer;
-
-    v = NextView(v);
-    l = NextLayer(l);
-  }
-
-  return false;
-}
-
-// Constructs a View tree with the specified depth.
-void ConstructTree(views::View* view, int depth) {
-  if (depth == 0)
-    return;
-  int count = base::RandInt(1, 5);
-  for (int i = 0; i < count; i++) {
-    views::View* v = new views::View;
-    view->AddChildView(v);
-    if (base::RandDouble() > 0.5)
-      v->SetPaintToLayer(true);
-    if (base::RandDouble() < 0.2)
-      v->SetVisible(false);
-
-    ConstructTree(v, depth - 1);
-  }
-}
-
-void ScrambleTree(views::View* view) {
-  int count = view->child_count();
-  if (count == 0)
-    return;
-  for (int i = 0; i < count; i++) {
-    ScrambleTree(view->child_at(i));
-  }
-
-  if (count > 1) {
-    int a = base::RandInt(0, count - 1);
-    int b = base::RandInt(0, count - 1);
-
-    views::View* view_a = view->child_at(a);
-    views::View* view_b = view->child_at(b);
-    view->ReorderChildView(view_a, b);
-    view->ReorderChildView(view_b, a);
-  }
-
-  if (!view->layer() && base::RandDouble() < 0.1)
-    view->SetPaintToLayer(true);
-
-  if (base::RandDouble() < 0.1)
-    view->SetVisible(!view->IsVisible());
-}
-
-}
-
-namespace views {
-
-typedef ViewsTestBase ViewTest;
-
-// A derived class for testing purpose.
-class TestView : public View {
- public:
-  TestView() : View(), in_touch_sequence_(false) {}
-  virtual ~TestView() {}
-
-  // Reset all test state
-  void Reset() {
-    did_change_bounds_ = false;
-    last_mouse_event_type_ = 0;
-    location_.SetPoint(0, 0);
-    last_touch_event_type_ = 0;
-    last_touch_event_was_handled_ = false;
-    last_clip_.setEmpty();
-    accelerator_count_map_.clear();
-  }
-
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
-  virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
-  virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
-  virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
-  virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
-  virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
-
-  // OnBoundsChanged.
-  bool did_change_bounds_;
-  gfx::Rect new_bounds_;
-
-  // MouseEvent.
-  int last_mouse_event_type_;
-  gfx::Point location_;
-
-  // Painting.
-  std::vector<gfx::Rect> scheduled_paint_rects_;
-
-  // TouchEvent.
-  int last_touch_event_type_;
-  bool last_touch_event_was_handled_;
-  bool in_touch_sequence_;
-
-  // Painting.
-  SkRect last_clip_;
-
-  // Accelerators.
-  std::map<ui::Accelerator, int> accelerator_count_map_;
-};
-
-// Mock instance of the GestureManager for testing.
-class MockGestureManager : public GestureManager {
- public:
-  // Reset all test state.
-  void Reset() {
-    last_touch_event_ = 0;
-    last_view_ = NULL;
-    previously_handled_flag_ = false;
-    dispatched_synthetic_event_ = false;
-  }
-
-  bool ProcessTouchEventForGesture(const TouchEvent& event,
-                                   View* source,
-                                   ui::TouchStatus status);
-  MockGestureManager();
-
-  bool previously_handled_flag_;
-  int last_touch_event_;
-  View *last_view_;
-  bool dispatched_synthetic_event_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockGestureManager);
-};
-
-// A view subclass that ignores all touch events for testing purposes.
-class TestViewIgnoreTouch : public TestView {
- public:
-  TestViewIgnoreTouch() : TestView() {}
-  virtual ~TestViewIgnoreTouch() {}
-
- private:
-  virtual ui::TouchStatus OnTouchEvent(const TouchEvent& event) OVERRIDE;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// OnBoundsChanged
-////////////////////////////////////////////////////////////////////////////////
-
-void TestView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  did_change_bounds_ = true;
-  new_bounds_ = bounds();
-}
-
-TEST_F(ViewTest, OnBoundsChanged) {
-  TestView v;
-
-  gfx::Rect prev_rect(0, 0, 200, 200);
-  gfx::Rect new_rect(100, 100, 250, 250);
-
-  v.SetBoundsRect(prev_rect);
-  v.Reset();
-  v.SetBoundsRect(new_rect);
-
-  EXPECT_EQ(v.did_change_bounds_, true);
-  EXPECT_EQ(v.new_bounds_, new_rect);
-  EXPECT_EQ(v.bounds(), new_rect);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// MouseEvent
-////////////////////////////////////////////////////////////////////////////////
-
-bool TestView::OnMousePressed(const MouseEvent& event) {
-  last_mouse_event_type_ = event.type();
-  location_.SetPoint(event.x(), event.y());
-  return true;
-}
-
-bool TestView::OnMouseDragged(const MouseEvent& event) {
-  last_mouse_event_type_ = event.type();
-  location_.SetPoint(event.x(), event.y());
-  return true;
-}
-
-void TestView::OnMouseReleased(const MouseEvent& event) {
-  last_mouse_event_type_ = event.type();
-  location_.SetPoint(event.x(), event.y());
-}
-
-TEST_F(ViewTest, MouseEvent) {
-  TestView* v1 = new TestView();
-  v1->SetBounds(0, 0, 300, 300);
-
-  TestView* v2 = new TestView();
-  v2->SetBounds(100, 100, 100, 100);
-
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-
-  root->AddChildView(v1);
-  v1->AddChildView(v2);
-
-  v1->Reset();
-  v2->Reset();
-
-  MouseEvent pressed(ui::ET_MOUSE_PRESSED,
-                     110,
-                     120,
-                     ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMousePressed(pressed);
-  EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_PRESSED);
-  EXPECT_EQ(v2->location_.x(), 10);
-  EXPECT_EQ(v2->location_.y(), 20);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_mouse_event_type_, 0);
-
-  // Drag event out of bounds. Should still go to v2
-  v1->Reset();
-  v2->Reset();
-  MouseEvent dragged(ui::ET_MOUSE_DRAGGED,
-                     50,
-                     40,
-                     ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMouseDragged(dragged);
-  EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_DRAGGED);
-  EXPECT_EQ(v2->location_.x(), -50);
-  EXPECT_EQ(v2->location_.y(), -60);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_mouse_event_type_, 0);
-
-  // Releasted event out of bounds. Should still go to v2
-  v1->Reset();
-  v2->Reset();
-  MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
-  root->OnMouseDragged(released);
-  EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_RELEASED);
-  EXPECT_EQ(v2->location_.x(), -100);
-  EXPECT_EQ(v2->location_.y(), -100);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_mouse_event_type_, 0);
-
-  widget->CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// TouchEvent
-////////////////////////////////////////////////////////////////////////////////
-bool MockGestureManager::ProcessTouchEventForGesture(
-    const TouchEvent& event,
-    View* source,
-    ui::TouchStatus status) {
-  if (status != ui::TOUCH_STATUS_UNKNOWN) {
-    dispatched_synthetic_event_ = false;
-    return false;
-  }
-  last_touch_event_ =  event.type();
-  last_view_ = source;
-  previously_handled_flag_ = status != ui::TOUCH_STATUS_UNKNOWN;
-  dispatched_synthetic_event_ = true;
-  return true;
-}
-
-MockGestureManager::MockGestureManager() {
-}
-
-ui::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
-  last_touch_event_type_ = event.type();
-  location_.SetPoint(event.x(), event.y());
-  if (!in_touch_sequence_) {
-    if (event.type() == ui::ET_TOUCH_PRESSED) {
-      in_touch_sequence_ = true;
-      return ui::TOUCH_STATUS_START;
-    }
-  } else {
-    if (event.type() == ui::ET_TOUCH_RELEASED) {
-      in_touch_sequence_ = false;
-      return ui::TOUCH_STATUS_END;
-    }
-    return ui::TOUCH_STATUS_CONTINUE;
-  }
-  return last_touch_event_was_handled_ ? ui::TOUCH_STATUS_CONTINUE :
-                                         ui::TOUCH_STATUS_UNKNOWN;
-}
-
-ui::TouchStatus TestViewIgnoreTouch::OnTouchEvent(const TouchEvent& event) {
-  return ui::TOUCH_STATUS_UNKNOWN;
-}
-
-TEST_F(ViewTest, TouchEvent) {
-  MockGestureManager gm;
-
-  TestView* v1 = new TestView();
-  v1->SetBounds(0, 0, 300, 300);
-
-  TestView* v2 = new TestView();
-  v2->SetBounds(100, 100, 100, 100);
-
-  TestView* v3 = new TestViewIgnoreTouch();
-  v3->SetBounds(0, 0, 100, 100);
-
-  scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-
-  root->AddChildView(v1);
-  static_cast<internal::RootView*>(root)->SetGestureManagerForTesting(&gm);
-  v1->AddChildView(v2);
-  v2->AddChildView(v3);
-
-  // |v3| completely obscures |v2|, but all the touch events on |v3| should
-  // reach |v2| because |v3| doesn't process any touch events.
-
-  // Make sure if none of the views handle the touch event, the gesture manager
-  // does.
-  v1->Reset();
-  v2->Reset();
-  gm.Reset();
-
-  TouchEvent unhandled(ui::ET_TOUCH_MOVED,
-                       400,
-                       400,
-                       0, /* no flags */
-                       0, /* first finger touch */
-                       1.0, 0.0, 1.0, 0.0);
-  root->OnTouchEvent(unhandled);
-
-  EXPECT_EQ(v1->last_touch_event_type_, 0);
-  EXPECT_EQ(v2->last_touch_event_type_, 0);
-
-  EXPECT_EQ(gm.previously_handled_flag_, false);
-  EXPECT_EQ(gm.last_touch_event_, ui::ET_TOUCH_MOVED);
-  EXPECT_EQ(gm.last_view_, root);
-  EXPECT_EQ(gm.dispatched_synthetic_event_, true);
-
-  // Test press, drag, release touch sequence.
-  v1->Reset();
-  v2->Reset();
-  gm.Reset();
-
-  TouchEvent pressed(ui::ET_TOUCH_PRESSED,
-                     110,
-                     120,
-                     0, /* no flags */
-                     0, /* first finger touch */
-                     1.0, 0.0, 1.0, 0.0);
-  v2->last_touch_event_was_handled_ = true;
-  root->OnTouchEvent(pressed);
-
-  EXPECT_EQ(v2->last_touch_event_type_, ui::ET_TOUCH_PRESSED);
-  EXPECT_EQ(v2->location_.x(), 10);
-  EXPECT_EQ(v2->location_.y(), 20);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_touch_event_type_, 0);
-
-  // Since v2 handled the touch-event, the gesture manager should not handle it.
-  EXPECT_EQ(gm.last_touch_event_, 0);
-  EXPECT_EQ(NULL, gm.last_view_);
-  EXPECT_EQ(gm.previously_handled_flag_, false);
-
-  // Drag event out of bounds. Should still go to v2
-  v1->Reset();
-  v2->Reset();
-  TouchEvent dragged(ui::ET_TOUCH_MOVED,
-                     50,
-                     40,
-                     0, /* no flags */
-                     0, /* first finger touch */
-                     1.0, 0.0, 1.0, 0.0);
-
-  root->OnTouchEvent(dragged);
-  EXPECT_EQ(v2->last_touch_event_type_, ui::ET_TOUCH_MOVED);
-  EXPECT_EQ(v2->location_.x(), -50);
-  EXPECT_EQ(v2->location_.y(), -60);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_touch_event_type_, 0);
-
-  EXPECT_EQ(gm.last_touch_event_, 0);
-  EXPECT_EQ(NULL, gm.last_view_);
-  EXPECT_EQ(gm.previously_handled_flag_, false);
-
-  // Released event out of bounds. Should still go to v2
-  v1->Reset();
-  v2->Reset();
-  TouchEvent released(ui::ET_TOUCH_RELEASED, 0, 0, 0, 0 /* first finger */,
-                      1.0, 0.0, 1.0, 0.0);
-  v2->last_touch_event_was_handled_ = true;
-  root->OnTouchEvent(released);
-  EXPECT_EQ(v2->last_touch_event_type_, ui::ET_TOUCH_RELEASED);
-  EXPECT_EQ(v2->location_.x(), -100);
-  EXPECT_EQ(v2->location_.y(), -100);
-  // Make sure v1 did not receive the event
-  EXPECT_EQ(v1->last_touch_event_type_, 0);
-
-  EXPECT_EQ(gm.last_touch_event_, 0);
-  EXPECT_EQ(NULL, gm.last_view_);
-  EXPECT_EQ(gm.previously_handled_flag_, false);
-
-  widget->CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Painting
-////////////////////////////////////////////////////////////////////////////////
-
-void TestView::Paint(gfx::Canvas* canvas) {
-  canvas->GetSkCanvas()->getClipBounds(&last_clip_);
-}
-
-void TestView::SchedulePaintInRect(const gfx::Rect& rect) {
-  scheduled_paint_rects_.push_back(rect);
-  View::SchedulePaintInRect(rect);
-}
-
-void CheckRect(const SkRect& check_rect, const SkRect& target_rect) {
-  EXPECT_EQ(target_rect.fLeft, check_rect.fLeft);
-  EXPECT_EQ(target_rect.fRight, check_rect.fRight);
-  EXPECT_EQ(target_rect.fTop, check_rect.fTop);
-  EXPECT_EQ(target_rect.fBottom, check_rect.fBottom);
-}
-
-/* This test is disabled because it is flakey on some systems.
-TEST_F(ViewTest, DISABLED_Painting) {
-  // Determine if InvalidateRect generates an empty paint rectangle.
-  EmptyWindow paint_window(CRect(50, 50, 650, 650));
-  paint_window.RedrawWindow(CRect(0, 0, 600, 600), NULL,
-                            RDW_UPDATENOW | RDW_INVALIDATE | RDW_ALLCHILDREN);
-  bool empty_paint = paint_window.empty_paint();
-
-  NativeWidgetWin window;
-  window.set_delete_on_destroy(false);
-  window.set_window_style(WS_OVERLAPPEDWINDOW);
-  window.Init(NULL, gfx::Rect(50, 50, 650, 650), NULL);
-  View* root = window.GetRootView();
-
-  TestView* v1 = new TestView();
-  v1->SetBounds(0, 0, 650, 650);
-  root->AddChildView(v1);
-
-  TestView* v2 = new TestView();
-  v2->SetBounds(10, 10, 80, 80);
-  v1->AddChildView(v2);
-
-  TestView* v3 = new TestView();
-  v3->SetBounds(10, 10, 60, 60);
-  v2->AddChildView(v3);
-
-  TestView* v4 = new TestView();
-  v4->SetBounds(10, 200, 100, 100);
-  v1->AddChildView(v4);
-
-  // Make sure to paint current rects
-  PaintRootView(root, empty_paint);
-
-
-  v1->Reset();
-  v2->Reset();
-  v3->Reset();
-  v4->Reset();
-  v3->SchedulePaintInRect(gfx::Rect(10, 10, 10, 10));
-  PaintRootView(root, empty_paint);
-
-  SkRect tmp_rect;
-
-  tmp_rect.set(SkIntToScalar(10),
-               SkIntToScalar(10),
-               SkIntToScalar(20),
-               SkIntToScalar(20));
-  CheckRect(v3->last_clip_, tmp_rect);
-
-  tmp_rect.set(SkIntToScalar(20),
-               SkIntToScalar(20),
-               SkIntToScalar(30),
-               SkIntToScalar(30));
-  CheckRect(v2->last_clip_, tmp_rect);
-
-  tmp_rect.set(SkIntToScalar(30),
-               SkIntToScalar(30),
-               SkIntToScalar(40),
-               SkIntToScalar(40));
-  CheckRect(v1->last_clip_, tmp_rect);
-
-  // Make sure v4 was not painted
-  tmp_rect.setEmpty();
-  CheckRect(v4->last_clip_, tmp_rect);
-
-  window.DestroyWindow();
-}
-*/
-
-#if defined(OS_WIN)
-TEST_F(ViewTest, RemoveNotification) {
-#else
-// TODO(beng): stopped working with widget hierarchy split,
-//             http://crbug.com/82364
-TEST_F(ViewTest, DISABLED_RemoveNotification) {
-#endif
-  ViewStorage* vs = ViewStorage::GetInstance();
-  Widget* widget = new Widget;
-  widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP));
-  View* root_view = widget->GetRootView();
-
-  View* v1 = new View;
-  int s1 = vs->CreateStorageID();
-  vs->StoreView(s1, v1);
-  root_view->AddChildView(v1);
-  View* v11 = new View;
-  int s11 = vs->CreateStorageID();
-  vs->StoreView(s11, v11);
-  v1->AddChildView(v11);
-  View* v111 = new View;
-  int s111 = vs->CreateStorageID();
-  vs->StoreView(s111, v111);
-  v11->AddChildView(v111);
-  View* v112 = new View;
-  int s112 = vs->CreateStorageID();
-  vs->StoreView(s112, v112);
-  v11->AddChildView(v112);
-  View* v113 = new View;
-  int s113 = vs->CreateStorageID();
-  vs->StoreView(s113, v113);
-  v11->AddChildView(v113);
-  View* v1131 = new View;
-  int s1131 = vs->CreateStorageID();
-  vs->StoreView(s1131, v1131);
-  v113->AddChildView(v1131);
-  View* v12 = new View;
-  int s12 = vs->CreateStorageID();
-  vs->StoreView(s12, v12);
-  v1->AddChildView(v12);
-
-  View* v2 = new View;
-  int s2 = vs->CreateStorageID();
-  vs->StoreView(s2, v2);
-  root_view->AddChildView(v2);
-  View* v21 = new View;
-  int s21 = vs->CreateStorageID();
-  vs->StoreView(s21, v21);
-  v2->AddChildView(v21);
-  View* v211 = new View;
-  int s211 = vs->CreateStorageID();
-  vs->StoreView(s211, v211);
-  v21->AddChildView(v211);
-
-  size_t stored_views = vs->view_count();
-
-  // Try removing a leaf view.
-  v21->RemoveChildView(v211);
-  EXPECT_EQ(stored_views - 1, vs->view_count());
-  EXPECT_EQ(NULL, vs->RetrieveView(s211));
-  delete v211;  // We won't use this one anymore.
-
-  // Now try removing a view with a hierarchy of depth 1.
-  v11->RemoveChildView(v113);
-  EXPECT_EQ(stored_views - 3, vs->view_count());
-  EXPECT_EQ(NULL, vs->RetrieveView(s113));
-  EXPECT_EQ(NULL, vs->RetrieveView(s1131));
-  delete v113;  // We won't use this one anymore.
-
-  // Now remove even more.
-  root_view->RemoveChildView(v1);
-  EXPECT_EQ(NULL, vs->RetrieveView(s1));
-  EXPECT_EQ(NULL, vs->RetrieveView(s11));
-  EXPECT_EQ(NULL, vs->RetrieveView(s12));
-  EXPECT_EQ(NULL, vs->RetrieveView(s111));
-  EXPECT_EQ(NULL, vs->RetrieveView(s112));
-
-  // Put v1 back for more tests.
-  root_view->AddChildView(v1);
-  vs->StoreView(s1, v1);
-
-  // Synchronously closing the window deletes the view hierarchy, which should
-  // remove all its views from ViewStorage.
-  widget->CloseNow();
-  EXPECT_EQ(stored_views - 10, vs->view_count());
-  EXPECT_EQ(NULL, vs->RetrieveView(s1));
-  EXPECT_EQ(NULL, vs->RetrieveView(s12));
-  EXPECT_EQ(NULL, vs->RetrieveView(s11));
-  EXPECT_EQ(NULL, vs->RetrieveView(s12));
-  EXPECT_EQ(NULL, vs->RetrieveView(s21));
-  EXPECT_EQ(NULL, vs->RetrieveView(s111));
-  EXPECT_EQ(NULL, vs->RetrieveView(s112));
-}
-
-namespace {
-class HitTestView : public View {
- public:
-  explicit HitTestView(bool has_hittest_mask)
-      : has_hittest_mask_(has_hittest_mask) {
-  }
-  virtual ~HitTestView() {}
-
- protected:
-  // Overridden from View:
-  virtual bool HasHitTestMask() const {
-    return has_hittest_mask_;
-  }
-  virtual void GetHitTestMask(gfx::Path* mask) const {
-    DCHECK(has_hittest_mask_);
-    DCHECK(mask);
-
-    SkScalar w = SkIntToScalar(width());
-    SkScalar h = SkIntToScalar(height());
-
-    // Create a triangular mask within the bounds of this View.
-    mask->moveTo(w / 2, 0);
-    mask->lineTo(w, h);
-    mask->lineTo(0, h);
-    mask->close();
-  }
-
- private:
-  bool has_hittest_mask_;
-
-  DISALLOW_COPY_AND_ASSIGN(HitTestView);
-};
-
-gfx::Point ConvertPointToView(View* view, const gfx::Point& p) {
-  gfx::Point tmp(p);
-  View::ConvertPointToView(view->GetWidget()->GetRootView(), view, &tmp);
-  return tmp;
-}
-
-void RotateCounterclockwise(ui::Transform& transform) {
-  transform.matrix().set3x3(0, -1, 0,
-                            1,  0, 0,
-                            0,  0, 1);
-}
-
-void RotateClockwise(ui::Transform& transform) {
-  transform.matrix().set3x3( 0, 1, 0,
-                            -1, 0, 0,
-                             0, 0, 1);
-}
-
-}  // namespace
-
-TEST_F(ViewTest, HitTestMasks) {
-  Widget* widget = new Widget;
-  widget->Init(Widget::InitParams(Widget::InitParams::TYPE_POPUP));
-  View* root_view = widget->GetRootView();
-  root_view->SetBounds(0, 0, 500, 500);
-
-  gfx::Rect v1_bounds = gfx::Rect(0, 0, 100, 100);
-  HitTestView* v1 = new HitTestView(false);
-  v1->SetBoundsRect(v1_bounds);
-  root_view->AddChildView(v1);
-
-  gfx::Rect v2_bounds = gfx::Rect(105, 0, 100, 100);
-  HitTestView* v2 = new HitTestView(true);
-  v2->SetBoundsRect(v2_bounds);
-  root_view->AddChildView(v2);
-
-  gfx::Point v1_centerpoint = v1_bounds.CenterPoint();
-  gfx::Point v2_centerpoint = v2_bounds.CenterPoint();
-  gfx::Point v1_origin = v1_bounds.origin();
-  gfx::Point v2_origin = v2_bounds.origin();
-
-  // Test HitTest
-  EXPECT_TRUE(v1->HitTest(ConvertPointToView(v1, v1_centerpoint)));
-  EXPECT_TRUE(v2->HitTest(ConvertPointToView(v2, v2_centerpoint)));
-
-  EXPECT_TRUE(v1->HitTest(ConvertPointToView(v1, v1_origin)));
-  EXPECT_FALSE(v2->HitTest(ConvertPointToView(v2, v2_origin)));
-
-  // Test GetEventHandlerForPoint
-  EXPECT_EQ(v1, root_view->GetEventHandlerForPoint(v1_centerpoint));
-  EXPECT_EQ(v2, root_view->GetEventHandlerForPoint(v2_centerpoint));
-  EXPECT_EQ(v1, root_view->GetEventHandlerForPoint(v1_origin));
-  EXPECT_EQ(root_view, root_view->GetEventHandlerForPoint(v2_origin));
-
-  widget->CloseNow();
-}
-
-TEST_F(ViewTest, Textfield) {
-  const string16 kText = ASCIIToUTF16("Reality is that which, when you stop "
-                                      "believing it, doesn't go away.");
-  const string16 kExtraText = ASCIIToUTF16("Pretty deep, Philip!");
-  const string16 kEmptyString;
-
-  ui::Clipboard clipboard;
-
-  Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.bounds = gfx::Rect(0, 0, 100, 100);
-  widget->Init(params);
-  View* root_view = widget->GetRootView();
-
-  Textfield* textfield = new Textfield();
-  root_view->AddChildView(textfield);
-
-  // Test setting, appending text.
-  textfield->SetText(kText);
-  EXPECT_EQ(kText, textfield->text());
-  textfield->AppendText(kExtraText);
-  EXPECT_EQ(kText + kExtraText, textfield->text());
-  textfield->SetText(string16());
-  EXPECT_EQ(kEmptyString, textfield->text());
-
-  // Test selection related methods.
-  textfield->SetText(kText);
-  EXPECT_EQ(kEmptyString, textfield->GetSelectedText());
-  textfield->SelectAll();
-  EXPECT_EQ(kText, textfield->text());
-  textfield->ClearSelection();
-  EXPECT_EQ(kEmptyString, textfield->GetSelectedText());
-
-  widget->CloseNow();
-}
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-
-// Tests that the Textfield view respond appropiately to cut/copy/paste.
-TEST_F(ViewTest, TextfieldCutCopyPaste) {
-  const string16 kNormalText = ASCIIToUTF16("Normal");
-  const string16 kReadOnlyText = ASCIIToUTF16("Read only");
-  const string16 kPasswordText = ASCIIToUTF16("Password! ** Secret stuff **");
-
-  ui::Clipboard clipboard;
-
-  Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.bounds = gfx::Rect(0, 0, 100, 100);
-  widget->Init(params);
-  View* root_view = widget->GetRootView();
-
-  Textfield* normal = new Textfield();
-  Textfield* read_only = new Textfield();
-  read_only->SetReadOnly(true);
-  Textfield* password = new Textfield(Textfield::STYLE_PASSWORD);
-
-  root_view->AddChildView(normal);
-  root_view->AddChildView(read_only);
-  root_view->AddChildView(password);
-
-  normal->SetText(kNormalText);
-  read_only->SetText(kReadOnlyText);
-  password->SetText(kPasswordText);
-
-  //
-  // Test cut.
-  //
-  ASSERT_TRUE(normal->GetTestingHandle());
-  normal->SelectAll();
-  ::SendMessage(normal->GetTestingHandle(), WM_CUT, 0, 0);
-
-  string16 result;
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  EXPECT_EQ(kNormalText, result);
-  normal->SetText(kNormalText);  // Let's revert to the original content.
-
-  ASSERT_TRUE(read_only->GetTestingHandle());
-  read_only->SelectAll();
-  ::SendMessage(read_only->GetTestingHandle(), WM_CUT, 0, 0);
-  result.clear();
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  // Cut should have failed, so the clipboard content should not have changed.
-  EXPECT_EQ(kNormalText, result);
-
-  ASSERT_TRUE(password->GetTestingHandle());
-  password->SelectAll();
-  ::SendMessage(password->GetTestingHandle(), WM_CUT, 0, 0);
-  result.clear();
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  // Cut should have failed, so the clipboard content should not have changed.
-  EXPECT_EQ(kNormalText, result);
-
-  //
-  // Test copy.
-  //
-
-  // Let's start with read_only as the clipboard already contains the content
-  // of normal.
-  read_only->SelectAll();
-  ::SendMessage(read_only->GetTestingHandle(), WM_COPY, 0, 0);
-  result.clear();
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  EXPECT_EQ(kReadOnlyText, result);
-
-  normal->SelectAll();
-  ::SendMessage(normal->GetTestingHandle(), WM_COPY, 0, 0);
-  result.clear();
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  EXPECT_EQ(kNormalText, result);
-
-  password->SelectAll();
-  ::SendMessage(password->GetTestingHandle(), WM_COPY, 0, 0);
-  result.clear();
-  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  // We don't let you copy from a password field, clipboard should not have
-  // changed.
-  EXPECT_EQ(kNormalText, result);
-
-  //
-  // Test Paste.
-  //
-  // Note that we use GetWindowText instead of Textfield::GetText below as the
-  // text in the Textfield class is synced to the text of the HWND on
-  // WM_KEYDOWN messages that we are not simulating here.
-
-  // Attempting to copy kNormalText in a read-only text-field should fail.
-  read_only->SelectAll();
-  ::SendMessage(read_only->GetTestingHandle(), WM_KEYDOWN, 0, 0);
-  wchar_t buffer[1024] = { 0 };
-  ::GetWindowText(read_only->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kReadOnlyText, string16(buffer));
-
-  password->SelectAll();
-  ::SendMessage(password->GetTestingHandle(), WM_PASTE, 0, 0);
-  ::GetWindowText(password->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kNormalText, string16(buffer));
-
-  // Copy from read_only so the string we are pasting is not the same as the
-  // current one.
-  read_only->SelectAll();
-  ::SendMessage(read_only->GetTestingHandle(), WM_COPY, 0, 0);
-  normal->SelectAll();
-  ::SendMessage(normal->GetTestingHandle(), WM_PASTE, 0, 0);
-  ::GetWindowText(normal->GetTestingHandle(), buffer, 1024);
-  EXPECT_EQ(kReadOnlyText, string16(buffer));
-  widget->CloseNow();
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Accelerators
-////////////////////////////////////////////////////////////////////////////////
-bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  accelerator_count_map_[accelerator]++;
-  return true;
-}
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-TEST_F(ViewTest, ActivateAccelerator) {
-  // Register a keyboard accelerator before the view is added to a window.
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
-  TestView* view = new TestView();
-  view->Reset();
-  view->AddAccelerator(return_accelerator);
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
-
-  // Create a window and add the view as its child.
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(0, 0, 100, 100);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-  root->AddChildView(view);
-  widget->Show();
-
-  // Get the focus manager.
-  FocusManager* focus_manager = widget->GetFocusManager();
-  ASSERT_TRUE(focus_manager);
-
-  // Hit the return key and see if it takes effect.
-  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
-
-  // Hit the escape key. Nothing should happen.
-  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
-  EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 0);
-
-  // Now register the escape key and hit it again.
-  view->AddAccelerator(escape_accelerator);
-  EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 1);
-
-  // Remove the return key accelerator.
-  view->RemoveAccelerator(return_accelerator);
-  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 1);
-
-  // Add it again. Hit the return key and the escape key.
-  view->AddAccelerator(return_accelerator);
-  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 2);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 1);
-  EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 2);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 2);
-
-  // Remove all the accelerators.
-  view->ResetAccelerators();
-  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 2);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 2);
-  EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 2);
-  EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 2);
-
-  widget->CloseNow();
-}
-#endif
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-TEST_F(ViewTest, HiddenViewWithAccelerator) {
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
-  TestView* view = new TestView();
-  view->Reset();
-  view->AddAccelerator(return_accelerator);
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
-
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(0, 0, 100, 100);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-  root->AddChildView(view);
-  widget->Show();
-
-  FocusManager* focus_manager = widget->GetFocusManager();
-  ASSERT_TRUE(focus_manager);
-
-  view->SetVisible(false);
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-
-  view->SetVisible(true);
-  EXPECT_EQ(view,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-
-  widget->CloseNow();
-}
-#endif
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
-  TestView* view = new TestView();
-  view->Reset();
-  view->AddAccelerator(return_accelerator);
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
-
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(0, 0, 100, 100);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-  root->AddChildView(view);
-
-  FocusManager* focus_manager = widget->GetFocusManager();
-  ASSERT_TRUE(focus_manager);
-
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-
-  widget->Show();
-  EXPECT_EQ(view,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-
-  widget->Hide();
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-
-  widget->CloseNow();
-}
-#endif
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-////////////////////////////////////////////////////////////////////////////////
-// Mouse-wheel message rerouting
-////////////////////////////////////////////////////////////////////////////////
-class ScrollableTestView : public View {
- public:
-  ScrollableTestView() { }
-
-  virtual gfx::Size GetPreferredSize() {
-    return gfx::Size(100, 10000);
-  }
-
-  virtual void Layout() {
-    SizeToPreferredSize();
-  }
-};
-
-class TestViewWithControls : public View {
- public:
-  TestViewWithControls() {
-    text_field_ = new Textfield();
-    AddChildView(text_field_);
-  }
-
-  Textfield* text_field_;
-};
-
-class SimpleWidgetDelegate : public WidgetDelegate {
- public:
-  explicit SimpleWidgetDelegate(View* contents) : contents_(contents) {  }
-
-  virtual void DeleteDelegate() { delete this; }
-
-  virtual View* GetContentsView() { return contents_; }
-
-  virtual Widget* GetWidget() { return contents_->GetWidget(); }
-  virtual const Widget* GetWidget() const { return contents_->GetWidget(); }
-
- private:
-  View* contents_;
-};
-
-// Tests that the mouse-wheel messages are correctly rerouted to the window
-// under the mouse.
-// TODO(jcampan): http://crbug.com/10572 Disabled as it fails on the Vista build
-//                bot.
-// Note that this fails for a variety of reasons:
-// - focused view is apparently reset across window activations and never
-//   properly restored
-// - this test depends on you not having any other window visible open under the
-//   area that it opens the test windows. --beng
-TEST_F(ViewTest, DISABLED_RerouteMouseWheelTest) {
-  TestViewWithControls* view_with_controls = new TestViewWithControls();
-  Widget* window1 = Widget::CreateWindowWithBounds(
-      new SimpleWidgetDelegate(view_with_controls),
-      gfx::Rect(0, 0, 100, 100));
-  window1->Show();
-  ScrollView* scroll_view = new ScrollView();
-  scroll_view->SetContents(new ScrollableTestView());
-  Widget* window2 = Widget::CreateWindowWithBounds(
-      new SimpleWidgetDelegate(scroll_view),
-      gfx::Rect(200, 200, 100, 100));
-  window2->Show();
-  EXPECT_EQ(0, scroll_view->GetVisibleRect().y());
-
-  // Make the window1 active, as this is what it would be in real-world.
-  window1->Activate();
-
-  // Let's send a mouse-wheel message to the different controls and check that
-  // it is rerouted to the window under the mouse (effectively scrolling the
-  // scroll-view).
-
-  // First to the Window's HWND.
-  ::SendMessage(view_with_controls->GetWidget()->GetNativeView(),
-                WM_MOUSEWHEEL, MAKEWPARAM(0, -20), MAKELPARAM(250, 250));
-  EXPECT_EQ(20, scroll_view->GetVisibleRect().y());
-
-  // Then the text-field.
-  ::SendMessage(view_with_controls->text_field_->GetTestingHandle(),
-                WM_MOUSEWHEEL, MAKEWPARAM(0, -20), MAKELPARAM(250, 250));
-  EXPECT_EQ(80, scroll_view->GetVisibleRect().y());
-
-  // Ensure we don't scroll when the mouse is not over that window.
-  ::SendMessage(view_with_controls->text_field_->GetTestingHandle(),
-                WM_MOUSEWHEEL, MAKEWPARAM(0, -20), MAKELPARAM(50, 50));
-  EXPECT_EQ(80, scroll_view->GetVisibleRect().y());
-
-  window1->CloseNow();
-  window2->CloseNow();
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Dialogs' default button
-////////////////////////////////////////////////////////////////////////////////
-
-class MockMenuModel : public ui::MenuModel {
- public:
-  MOCK_CONST_METHOD0(HasIcons, bool());
-  MOCK_CONST_METHOD1(GetFirstItemIndex, int(gfx::NativeMenu native_menu));
-  MOCK_CONST_METHOD0(GetItemCount, int());
-  MOCK_CONST_METHOD1(GetTypeAt, ItemType(int index));
-  MOCK_CONST_METHOD1(GetCommandIdAt, int(int index));
-  MOCK_CONST_METHOD1(GetLabelAt, string16(int index));
-  MOCK_CONST_METHOD1(IsItemDynamicAt, bool(int index));
-  MOCK_CONST_METHOD1(GetLabelFontAt, const gfx::Font* (int index));
-  MOCK_CONST_METHOD2(GetAcceleratorAt, bool(int index,
-      ui::Accelerator* accelerator));
-  MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index));
-  MOCK_CONST_METHOD1(GetGroupIdAt, int(int index));
-  MOCK_METHOD2(GetIconAt, bool(int index, SkBitmap* icon));
-  MOCK_CONST_METHOD1(GetButtonMenuItemAt, ui::ButtonMenuItemModel*(int index));
-  MOCK_CONST_METHOD1(IsEnabledAt, bool(int index));
-  MOCK_CONST_METHOD1(IsVisibleAt, bool(int index));
-  MOCK_CONST_METHOD1(GetSubmenuModelAt, MenuModel*(int index));
-  MOCK_METHOD1(HighlightChangedTo, void(int index));
-  MOCK_METHOD1(ActivatedAt, void(int index));
-  MOCK_METHOD2(ActivatedAt, void(int index, int disposition));
-  MOCK_METHOD0(MenuWillShow, void());
-  MOCK_METHOD0(MenuClosed, void());
-  MOCK_METHOD1(SetMenuModelDelegate, void(ui::MenuModelDelegate* delegate));
-  MOCK_METHOD3(GetModelAndIndexForCommandId, bool(int command_id,
-      MenuModel** model, int* index));
-};
-
-class TestDialog : public DialogDelegate, public ButtonListener {
- public:
-  explicit TestDialog(MockMenuModel* mock_menu_model)
-      : contents_(NULL),
-        button1_(NULL),
-        button2_(NULL),
-        checkbox_(NULL),
-        button_drop_(NULL),
-        last_pressed_button_(NULL),
-        mock_menu_model_(mock_menu_model),
-        canceled_(false),
-        oked_(false),
-        closeable_(false),
-        widget_(NULL) {
-  }
-
-  void TearDown() {
-    // Now we can close safely.
-    closeable_ = true;
-    widget_->Close();
-    widget_ = NULL;
-    // delegate has to be alive while shutting down.
-    MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-  }
-
-  // DialogDelegate implementation:
-  virtual int GetDefaultDialogButton() const OVERRIDE {
-    return ui::DIALOG_BUTTON_OK;
-  }
-
-  virtual View* GetContentsView() OVERRIDE {
-    if (!contents_) {
-      contents_ = new View;
-      button1_ = new NativeTextButton(this, ASCIIToUTF16("Button1"));
-      button2_ = new NativeTextButton(this, ASCIIToUTF16("Button2"));
-      checkbox_ = new Checkbox(ASCIIToUTF16("My checkbox"));
-      button_drop_ = new ButtonDropDown(this, mock_menu_model_);
-      contents_->AddChildView(button1_);
-      contents_->AddChildView(button2_);
-      contents_->AddChildView(checkbox_);
-      contents_->AddChildView(button_drop_);
-    }
-    return contents_;
-  }
-
-  // Prevent the dialog from really closing (so we can click the OK/Cancel
-  // buttons to our heart's content).
-  virtual bool Cancel() OVERRIDE {
-    canceled_ = true;
-    return closeable_;
-  }
-  virtual bool Accept() OVERRIDE {
-    oked_ = true;
-    return closeable_;
-  }
-
-  virtual Widget* GetWidget() OVERRIDE {
-    return widget_;
-  }
-  virtual const Widget* GetWidget() const OVERRIDE {
-    return widget_;
-  }
-
-  // ButtonListener implementation.
-  virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE {
-    last_pressed_button_ = sender;
-  }
-
-  void ResetStates() {
-    oked_ = false;
-    canceled_ = false;
-    last_pressed_button_ = NULL;
-  }
-
-  // Set up expectations for methods that are called when an (empty) menu is
-  // shown from a drop down button.
-  void ExpectShowDropMenu() {
-    if (mock_menu_model_) {
-      EXPECT_CALL(*mock_menu_model_, HasIcons());
-      EXPECT_CALL(*mock_menu_model_, GetFirstItemIndex(_));
-      EXPECT_CALL(*mock_menu_model_, GetItemCount());
-      EXPECT_CALL(*mock_menu_model_, MenuClosed());
-    }
-  }
-
-  View* contents_;
-  NativeTextButton* button1_;
-  NativeTextButton* button2_;
-  Checkbox* checkbox_;
-  ButtonDropDown* button_drop_;
-  Button* last_pressed_button_;
-  MockMenuModel* mock_menu_model_;
-
-  bool canceled_;
-  bool oked_;
-  bool closeable_;
-  Widget* widget_;
-};
-
-class DefaultButtonTest : public ViewTest {
- public:
-  enum ButtonID {
-    OK,
-    CANCEL,
-    BUTTON1,
-    BUTTON2
-  };
-
-  DefaultButtonTest()
-      : focus_manager_(NULL),
-        test_dialog_(NULL),
-        client_view_(NULL),
-        ok_button_(NULL),
-        cancel_button_(NULL) {
-  }
-
-  virtual void SetUp() OVERRIDE {
-    ViewTest::SetUp();
-    test_dialog_ = new TestDialog(NULL);
-    Widget* window =
-        Widget::CreateWindowWithBounds(test_dialog_, gfx::Rect(0, 0, 100, 100));
-    test_dialog_->widget_ = window;
-    window->Show();
-    focus_manager_ = test_dialog_->contents_->GetFocusManager();
-    ASSERT_TRUE(focus_manager_ != NULL);
-    client_view_ =
-        static_cast<DialogClientView*>(window->client_view());
-    ok_button_ = client_view_->ok_button();
-    cancel_button_ = client_view_->cancel_button();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    test_dialog_->TearDown();
-    ViewTest::TearDown();
-  }
-
-  void SimulatePressingEnterAndCheckDefaultButton(ButtonID button_id) {
-    KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0);
-    focus_manager_->OnKeyEvent(event);
-    switch (button_id) {
-      case OK:
-        EXPECT_TRUE(test_dialog_->oked_);
-        EXPECT_FALSE(test_dialog_->canceled_);
-        EXPECT_FALSE(test_dialog_->last_pressed_button_);
-        break;
-      case CANCEL:
-        EXPECT_FALSE(test_dialog_->oked_);
-        EXPECT_TRUE(test_dialog_->canceled_);
-        EXPECT_FALSE(test_dialog_->last_pressed_button_);
-        break;
-      case BUTTON1:
-        EXPECT_FALSE(test_dialog_->oked_);
-        EXPECT_FALSE(test_dialog_->canceled_);
-        EXPECT_TRUE(test_dialog_->last_pressed_button_ ==
-            test_dialog_->button1_);
-        break;
-      case BUTTON2:
-        EXPECT_FALSE(test_dialog_->oked_);
-        EXPECT_FALSE(test_dialog_->canceled_);
-        EXPECT_TRUE(test_dialog_->last_pressed_button_ ==
-            test_dialog_->button2_);
-        break;
-    }
-    test_dialog_->ResetStates();
-  }
-
-  FocusManager* focus_manager_;
-  TestDialog* test_dialog_;
-  DialogClientView* client_view_;
-  NativeTextButton* ok_button_;
-  NativeTextButton* cancel_button_;
-};
-
-TEST_F(DefaultButtonTest, DialogDefaultButtonTest) {
-  // Window has just been shown, we expect the default button specified in the
-  // DialogDelegate.
-  EXPECT_TRUE(ok_button_->is_default());
-
-  // Simulate pressing enter, that should trigger the OK button.
-  SimulatePressingEnterAndCheckDefaultButton(OK);
-
-  // Simulate focusing another button, it should become the default button.
-  client_view_->OnWillChangeFocus(ok_button_, test_dialog_->button1_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_TRUE(test_dialog_->button1_->is_default());
-  // Simulate pressing enter, that should trigger button1.
-  SimulatePressingEnterAndCheckDefaultButton(BUTTON1);
-
-  // Now select something that is not a button, the OK should become the default
-  // button again.
-  client_view_->OnWillChangeFocus(test_dialog_->button1_,
-                                  test_dialog_->checkbox_);
-  EXPECT_TRUE(ok_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(OK);
-
-  // Select yet another button.
-  client_view_->OnWillChangeFocus(test_dialog_->checkbox_,
-                                  test_dialog_->button2_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  EXPECT_TRUE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(BUTTON2);
-
-  // Focus nothing.
-  client_view_->OnWillChangeFocus(test_dialog_->button2_, NULL);
-  EXPECT_TRUE(ok_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  EXPECT_FALSE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(OK);
-
-  // Focus the cancel button.
-  client_view_->OnWillChangeFocus(NULL, cancel_button_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_TRUE(cancel_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  EXPECT_FALSE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(CANCEL);
-}
-
-class ButtonDropDownTest : public ViewTest {
- public:
-  ButtonDropDownTest()
-      : test_dialog_(NULL),
-        button_as_view_(NULL) {
-  }
-
-  virtual void SetUp() OVERRIDE {
-    ViewTest::SetUp();
-    test_dialog_ = new TestDialog(&mock_menu_model_);
-    Widget* window =
-        Widget::CreateWindowWithBounds(test_dialog_, gfx::Rect(0, 0, 100, 100));
-    test_dialog_->widget_ = window;
-    window->Show();
-    test_dialog_->button_drop_->SetBounds(0, 0, 100, 100);
-    // We have to cast the button back into a View in order to invoke it's
-    // OnMouseReleased method.
-    button_as_view_ = static_cast<View*>(test_dialog_->button_drop_);
-  }
-
-  virtual void TearDown() OVERRIDE {
-    test_dialog_->TearDown();
-    ViewTest::TearDown();
-  }
-
-  TestDialog* test_dialog_;
-  MockMenuModel mock_menu_model_;
-  // This is owned by test_dialog_.
-  View* button_as_view_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ButtonDropDownTest);
-};
-
-// Ensure that regular clicks on the drop down button still work. (i.e. - the
-// click events are processed and the listener gets the click)
-TEST_F(ButtonDropDownTest, RegularClickTest) {
-  MouseEvent press_event(ui::ET_MOUSE_PRESSED, 1, 1, ui::EF_LEFT_BUTTON_DOWN);
-  MouseEvent release_event(ui::ET_MOUSE_RELEASED, 1, 1,
-                           ui::EF_LEFT_BUTTON_DOWN);
-  button_as_view_->OnMousePressed(press_event);
-  button_as_view_->OnMouseReleased(release_event);
-  EXPECT_EQ(test_dialog_->last_pressed_button_, test_dialog_->button_drop_);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// View hierarchy / Visibility changes
-////////////////////////////////////////////////////////////////////////////////
-/*
-TEST_F(ViewTest, ChangeVisibility) {
-#if defined(OS_LINUX)
-  // Make CRITICAL messages fatal
-  // TODO(oshima): we probably should enable this for entire tests on linux.
-  g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-#endif
-  scoped_ptr<Widget> window(CreateWidget());
-  window->Init(NULL, gfx::Rect(0, 0, 500, 300));
-  View* root_view = window->GetRootView();
-  NativeTextButton* native = new NativeTextButton(NULL, ASCIIToUTF16("Native"));
-
-  root_view->SetContentsView(native);
-  native->SetVisible(true);
-
-  root_view->RemoveChildView(native);
-  native->SetVisible(false);
-  // Change visibility to true with no widget.
-  native->SetVisible(true);
-
-  root_view->SetContentsView(native);
-  native->SetVisible(true);
-}
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// Native view hierachy
-////////////////////////////////////////////////////////////////////////////////
-class TestNativeViewHierarchy : public View {
- public:
-  TestNativeViewHierarchy() {
-  }
-
-  virtual void NativeViewHierarchyChanged(bool attached,
-                                          gfx::NativeView native_view,
-                                          internal::RootView* root_view) {
-    NotificationInfo info;
-    info.attached = attached;
-    info.native_view = native_view;
-    info.root_view = root_view;
-    notifications_.push_back(info);
-  };
-  struct NotificationInfo {
-    bool attached;
-    gfx::NativeView native_view;
-    internal::RootView* root_view;
-  };
-  static const size_t kTotalViews = 2;
-  std::vector<NotificationInfo> notifications_;
-};
-
-class TestChangeNativeViewHierarchy {
- public:
-  explicit TestChangeNativeViewHierarchy(ViewTest *view_test) {
-    view_test_ = view_test;
-    native_host_ = new NativeViewHost();
-    host_ = new Widget;
-    Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-    params.bounds = gfx::Rect(0, 0, 500, 300);
-    host_->Init(params);
-    host_->GetRootView()->AddChildView(native_host_);
-    for (size_t i = 0; i < TestNativeViewHierarchy::kTotalViews; ++i) {
-      windows_[i] = new Widget;
-      Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
-      params.parent = host_->GetNativeView();
-      params.bounds = gfx::Rect(0, 0, 500, 300);
-      windows_[i]->Init(params);
-      root_views_[i] = windows_[i]->GetRootView();
-      test_views_[i] = new TestNativeViewHierarchy;
-      root_views_[i]->AddChildView(test_views_[i]);
-    }
-  }
-
-  ~TestChangeNativeViewHierarchy() {
-    for (size_t i = 0; i < TestNativeViewHierarchy::kTotalViews; ++i) {
-      windows_[i]->Close();
-    }
-    host_->Close();
-    // Will close and self-delete widgets - no need to manually delete them.
-    view_test_->RunPendingMessages();
-  }
-
-  void CheckEnumeratingNativeWidgets() {
-    if (!host_->GetTopLevelWidget())
-      return;
-    Widget::Widgets widgets;
-    Widget::GetAllChildWidgets(host_->GetNativeView(), &widgets);
-    EXPECT_EQ(TestNativeViewHierarchy::kTotalViews + 1, widgets.size());
-    // Unfortunately there is no guarantee the sequence of views here so always
-    // go through all of them.
-    for (Widget::Widgets::iterator i = widgets.begin();
-         i != widgets.end(); ++i) {
-      View* root_view = (*i)->GetRootView();
-      if (host_->GetRootView() == root_view)
-        continue;
-      size_t j;
-      for (j = 0; j < TestNativeViewHierarchy::kTotalViews; ++j)
-        if (root_views_[j] == root_view)
-          break;
-      // EXPECT_LT/GT/GE() fails to compile with class-defined constants
-      // with gcc, with error
-      // "error: undefined reference to 'TestNativeViewHierarchy::kTotalViews'"
-      // so I forced to use EXPECT_TRUE() instead.
-      EXPECT_TRUE(TestNativeViewHierarchy::kTotalViews > j);
-    }
-  }
-
-  void CheckChangingHierarhy() {
-    size_t i;
-    for (i = 0; i < TestNativeViewHierarchy::kTotalViews; ++i) {
-      // TODO(georgey): use actual hierarchy changes to send notifications.
-      static_cast<internal::RootView*>(root_views_[i])->
-          NotifyNativeViewHierarchyChanged(false, host_->GetNativeView());
-      static_cast<internal::RootView*>(root_views_[i])->
-          NotifyNativeViewHierarchyChanged(true, host_->GetNativeView());
-    }
-    for (i = 0; i < TestNativeViewHierarchy::kTotalViews; ++i) {
-      ASSERT_EQ(static_cast<size_t>(2), test_views_[i]->notifications_.size());
-      EXPECT_FALSE(test_views_[i]->notifications_[0].attached);
-      EXPECT_EQ(host_->GetNativeView(),
-          test_views_[i]->notifications_[0].native_view);
-      EXPECT_EQ(root_views_[i], test_views_[i]->notifications_[0].root_view);
-      EXPECT_TRUE(test_views_[i]->notifications_[1].attached);
-      EXPECT_EQ(host_->GetNativeView(),
-          test_views_[i]->notifications_[1].native_view);
-      EXPECT_EQ(root_views_[i], test_views_[i]->notifications_[1].root_view);
-    }
-  }
-
-  NativeViewHost* native_host_;
-  Widget* host_;
-  Widget* windows_[TestNativeViewHierarchy::kTotalViews];
-  View* root_views_[TestNativeViewHierarchy::kTotalViews];
-  TestNativeViewHierarchy* test_views_[TestNativeViewHierarchy::kTotalViews];
-  ViewTest* view_test_;
-};
-
-TEST_F(ViewTest, ChangeNativeViewHierarchyFindRoots) {
-  // TODO(georgey): Fix the test for Linux
-#if defined(OS_WIN)
-  TestChangeNativeViewHierarchy test(this);
-  test.CheckEnumeratingNativeWidgets();
-#endif
-}
-
-TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
-  // TODO(georgey): Fix the test for Linux
-#if defined(OS_WIN)
-  TestChangeNativeViewHierarchy test(this);
-  test.CheckChangingHierarhy();
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Transformations
-////////////////////////////////////////////////////////////////////////////////
-
-class TransformPaintView : public TestView {
- public:
-  TransformPaintView() {}
-  virtual ~TransformPaintView() {}
-
-  void ClearScheduledPaintRect() {
-    scheduled_paint_rect_ = gfx::Rect();
-  }
-
-  gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; }
-
-  // Overridden from View:
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) {
-    gfx::Rect xrect = ConvertRectToParent(rect);
-    scheduled_paint_rect_ = scheduled_paint_rect_.Union(xrect);
-  }
-
- private:
-  gfx::Rect scheduled_paint_rect_;
-
-  DISALLOW_COPY_AND_ASSIGN(TransformPaintView);
-};
-
-TEST_F(ViewTest, TransformPaint) {
-  TransformPaintView* v1 = new TransformPaintView();
-  v1->SetBounds(0, 0, 500, 300);
-
-  TestView* v2 = new TestView();
-  v2->SetBounds(100, 100, 200, 100);
-
-  Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget->Init(params);
-  widget->Show();
-  View* root = widget->GetRootView();
-
-  root->AddChildView(v1);
-  v1->AddChildView(v2);
-
-  // At this moment, |v2| occupies (100, 100) to (300, 200) in |root|.
-  v1->ClearScheduledPaintRect();
-  v2->SchedulePaint();
-
-  EXPECT_EQ(gfx::Rect(100, 100, 200, 100), v1->scheduled_paint_rect());
-
-  // Rotate |v1| counter-clockwise.
-  ui::Transform transform;
-  RotateCounterclockwise(transform);
-  transform.SetTranslateY(500.0f);
-  v1->SetTransform(transform);
-
-  // |v2| now occupies (100, 200) to (200, 400) in |root|.
-
-  v1->ClearScheduledPaintRect();
-  v2->SchedulePaint();
-
-  EXPECT_EQ(gfx::Rect(100, 200, 100, 200), v1->scheduled_paint_rect());
-
-  widget->CloseNow();
-}
-
-TEST_F(ViewTest, TransformEvent) {
-  TestView* v1 = new TestView();
-  v1->SetBounds(0, 0, 500, 300);
-
-  TestView* v2 = new TestView();
-  v2->SetBounds(100, 100, 200, 100);
-
-  Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-
-  root->AddChildView(v1);
-  v1->AddChildView(v2);
-
-  // At this moment, |v2| occupies (100, 100) to (300, 200) in |root|.
-
-  // Rotate |v1| counter-clockwise.
-  ui::Transform transform(v1->GetTransform());
-  RotateCounterclockwise(transform);
-  transform.SetTranslateY(500.0f);
-  v1->SetTransform(transform);
-
-  // |v2| now occupies (100, 200) to (200, 400) in |root|.
-  v1->Reset();
-  v2->Reset();
-
-  MouseEvent pressed(ui::ET_MOUSE_PRESSED,
-                     110, 210,
-                     ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMousePressed(pressed);
-  EXPECT_EQ(0, v1->last_mouse_event_type_);
-  EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
-  EXPECT_EQ(190, v2->location_.x());
-  EXPECT_EQ(10, v2->location_.y());
-
-  MouseEvent released(ui::ET_MOUSE_RELEASED, 0, 0, 0);
-  root->OnMouseReleased(released);
-
-  // Now rotate |v2| inside |v1| clockwise.
-  transform = v2->GetTransform();
-  RotateClockwise(transform);
-  transform.SetTranslateX(100.0f);
-  v2->SetTransform(transform);
-
-  // Now, |v2| occupies (100, 100) to (200, 300) in |v1|, and (100, 300) to
-  // (300, 400) in |root|.
-
-  v1->Reset();
-  v2->Reset();
-
-  MouseEvent p2(ui::ET_MOUSE_PRESSED,
-                110, 320,
-                ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMousePressed(p2);
-  EXPECT_EQ(0, v1->last_mouse_event_type_);
-  EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
-  EXPECT_EQ(10, v2->location_.x());
-  EXPECT_EQ(20, v2->location_.y());
-
-  root->OnMouseReleased(released);
-
-  v1->SetTransform(ui::Transform());
-  v2->SetTransform(ui::Transform());
-
-  TestView* v3 = new TestView();
-  v3->SetBounds(10, 10, 20, 30);
-  v2->AddChildView(v3);
-
-  // Rotate |v3| clockwise with respect to |v2|.
-  transform = v1->GetTransform();
-  RotateClockwise(transform);
-  transform.SetTranslateX(30.0f);
-  v3->SetTransform(transform);
-
-  // Scale |v2| with respect to |v1| along both axis.
-  transform = v2->GetTransform();
-  transform.SetScale(0.8f, 0.5f);
-  v2->SetTransform(transform);
-
-  // |v3| occupies (108, 105) to (132, 115) in |root|.
-
-  v1->Reset();
-  v2->Reset();
-  v3->Reset();
-
-  MouseEvent p3(ui::ET_MOUSE_PRESSED,
-                112, 110,
-                ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMousePressed(p3);
-
-  EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
-  EXPECT_EQ(10, v3->location_.x());
-  EXPECT_EQ(25, v3->location_.y());
-
-  root->OnMouseReleased(released);
-
-  v1->SetTransform(ui::Transform());
-  v2->SetTransform(ui::Transform());
-  v3->SetTransform(ui::Transform());
-
-  v1->Reset();
-  v2->Reset();
-  v3->Reset();
-
-  // Rotate |v3| clockwise with respect to |v2|, and scale it along both axis.
-  transform = v3->GetTransform();
-  RotateClockwise(transform);
-  transform.SetTranslateX(30.0f);
-  // Rotation sets some scaling transformation. Using SetScale would overwrite
-  // that and pollute the rotation. So combine the scaling with the existing
-  // transforamtion.
-  transform.ConcatScale(0.8f, 0.5f);
-  v3->SetTransform(transform);
-
-  // Translate |v2| with respect to |v1|.
-  transform = v2->GetTransform();
-  transform.SetTranslate(10, 10);
-  v2->SetTransform(transform);
-
-  // |v3| now occupies (120, 120) to (144, 130) in |root|.
-
-  MouseEvent p4(ui::ET_MOUSE_PRESSED,
-                124, 125,
-                ui::EF_LEFT_BUTTON_DOWN);
-  root->OnMousePressed(p4);
-
-  EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
-  EXPECT_EQ(10, v3->location_.x());
-  EXPECT_EQ(25, v3->location_.y());
-
-  root->OnMouseReleased(released);
-
-  widget->CloseNow();
-}
-
-TEST_F(ViewTest, TransformVisibleBound) {
-  gfx::Rect viewport_bounds(0, 0, 100, 100);
-
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = viewport_bounds;
-  widget->Init(params);
-  widget->GetRootView()->SetBoundsRect(viewport_bounds);
-
-  View* viewport = new View;
-  widget->SetContentsView(viewport);
-  View* contents = new View;
-  viewport->AddChildView(contents);
-  viewport->SetBoundsRect(viewport_bounds);
-  contents->SetBounds(0, 0, 100, 200);
-
-  View* child = new View;
-  contents->AddChildView(child);
-  child->SetBounds(10, 90, 50, 50);
-  EXPECT_EQ(gfx::Rect(0, 0, 50, 10), child->GetVisibleBounds());
-
-  // Rotate |child| counter-clockwise
-  ui::Transform transform;
-  RotateCounterclockwise(transform);
-  transform.SetTranslateY(50.0f);
-  child->SetTransform(transform);
-  EXPECT_EQ(gfx::Rect(40, 0, 10, 50), child->GetVisibleBounds());
-
-  widget->CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// OnVisibleBoundsChanged()
-
-class VisibleBoundsView : public View {
- public:
-  VisibleBoundsView() : received_notification_(false) {}
-  virtual ~VisibleBoundsView() {}
-
-  bool received_notification() const { return received_notification_; }
-  void set_received_notification(bool received) {
-    received_notification_ = received;
-  }
-
- private:
-  // Overridden from View:
-  virtual bool NeedsNotificationWhenVisibleBoundsChange() const {
-     return true;
-  }
-  virtual void OnVisibleBoundsChanged() {
-    received_notification_ = true;
-  }
-
-  bool received_notification_;
-
-  DISALLOW_COPY_AND_ASSIGN(VisibleBoundsView);
-};
-
-TEST_F(ViewTest, OnVisibleBoundsChanged) {
-  gfx::Rect viewport_bounds(0, 0, 100, 100);
-
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = viewport_bounds;
-  widget->Init(params);
-  widget->GetRootView()->SetBoundsRect(viewport_bounds);
-
-  View* viewport = new View;
-  widget->SetContentsView(viewport);
-  View* contents = new View;
-  viewport->AddChildView(contents);
-  viewport->SetBoundsRect(viewport_bounds);
-  contents->SetBounds(0, 0, 100, 200);
-
-  // Create a view that cares about visible bounds notifications, and position
-  // it just outside the visible bounds of the viewport.
-  VisibleBoundsView* child = new VisibleBoundsView;
-  contents->AddChildView(child);
-  child->SetBounds(10, 110, 50, 50);
-
-  // The child bound should be fully clipped.
-  EXPECT_TRUE(child->GetVisibleBounds().IsEmpty());
-
-  // Now scroll the contents, but not enough to make the child visible.
-  contents->SetY(contents->y() - 1);
-
-  // We should have received the notification since the visible bounds may have
-  // changed (even though they didn't).
-  EXPECT_TRUE(child->received_notification());
-  EXPECT_TRUE(child->GetVisibleBounds().IsEmpty());
-  child->set_received_notification(false);
-
-  // Now scroll the contents, this time by enough to make the child visible by
-  // one pixel.
-  contents->SetY(contents->y() - 10);
-  EXPECT_TRUE(child->received_notification());
-  EXPECT_EQ(1, child->GetVisibleBounds().height());
-  child->set_received_notification(false);
-
-  widget->CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BoundsChanged()
-
-TEST_F(ViewTest, SetBoundsPaint) {
-  TestView top_view;
-  TestView* child_view = new TestView;
-
-  top_view.SetBounds(0, 0, 100, 100);
-  top_view.scheduled_paint_rects_.clear();
-  child_view->SetBounds(10, 10, 20, 20);
-  top_view.AddChildView(child_view);
-
-  top_view.scheduled_paint_rects_.clear();
-  child_view->SetBounds(30, 30, 20, 20);
-  EXPECT_EQ(2U, top_view.scheduled_paint_rects_.size());
-
-  // There should be 2 rects, spanning from (10, 10) to (50, 50).
-  gfx::Rect paint_rect =
-      top_view.scheduled_paint_rects_[0].Union(
-          top_view.scheduled_paint_rects_[1]);
-  EXPECT_EQ(gfx::Rect(10, 10, 40, 40), paint_rect);
-}
-
-// Tests conversion methods with a transform.
-TEST_F(ViewTest, ConvertPointToViewWithTransform) {
-  TestView top_view;
-  TestView* child = new TestView;
-  TestView* child_child = new TestView;
-
-  top_view.AddChildView(child);
-  child->AddChildView(child_child);
-
-  top_view.SetBounds(0, 0, 1000, 1000);
-
-  child->SetBounds(7, 19, 500, 500);
-  ui::Transform transform;
-  transform.SetScale(3.0f, 4.0f);
-  child->SetTransform(transform);
-
-  child_child->SetBounds(17, 13, 100, 100);
-  transform = ui::Transform();
-  transform.SetScale(5.0f, 7.0f);
-  child_child->SetTransform(transform);
-
-  // Sanity check to make sure basic transforms act as expected.
-  {
-    ui::Transform transform;
-    transform.ConcatTranslate(1, 1);
-    transform.ConcatScale(100, 55);
-    transform.ConcatTranslate(110, -110);
-
-    // convert to a 3x3 matrix.
-    const SkMatrix& matrix = transform.matrix();
-
-    EXPECT_EQ(210, matrix.getTranslateX());
-    EXPECT_EQ(-55, matrix.getTranslateY());
-    EXPECT_EQ(100, matrix.getScaleX());
-    EXPECT_EQ(55, matrix.getScaleY());
-    EXPECT_EQ(0, matrix.getSkewX());
-    EXPECT_EQ(0, matrix.getSkewY());
-  }
-
-  {
-    ui::Transform transform;
-    transform.SetTranslate(1, 1);
-    ui::Transform t2;
-    t2.SetScale(100, 55);
-    ui::Transform t3;
-    t3.SetTranslate(110, -110);
-    transform.ConcatTransform(t2);
-    transform.ConcatTransform(t3);
-
-    // convert to a 3x3 matrix
-    const SkMatrix& matrix = transform.matrix();
-
-    EXPECT_EQ(210, matrix.getTranslateX());
-    EXPECT_EQ(-55, matrix.getTranslateY());
-    EXPECT_EQ(100, matrix.getScaleX());
-    EXPECT_EQ(55, matrix.getScaleY());
-    EXPECT_EQ(0, matrix.getSkewX());
-    EXPECT_EQ(0, matrix.getSkewY());
-  }
-
-  // Conversions from child->top and top->child.
-  {
-    gfx::Point point(5, 5);
-    View::ConvertPointToView(child, &top_view, &point);
-    EXPECT_EQ(22, point.x());
-    EXPECT_EQ(39, point.y());
-
-    point.SetPoint(22, 39);
-    View::ConvertPointToView(&top_view, child, &point);
-    EXPECT_EQ(5, point.x());
-    EXPECT_EQ(5, point.y());
-  }
-
-  // Conversions from child_child->top and top->child_child.
-  {
-    gfx::Point point(5, 5);
-    View::ConvertPointToView(child_child, &top_view, &point);
-    EXPECT_EQ(133, point.x());
-    EXPECT_EQ(211, point.y());
-
-    point.SetPoint(133, 211);
-    View::ConvertPointToView(&top_view, child_child, &point);
-    EXPECT_EQ(5, point.x());
-    EXPECT_EQ(5, point.y());
-  }
-
-  // Conversions from child_child->child and child->child_child
-  {
-    gfx::Point point(5, 5);
-    View::ConvertPointToView(child_child, child, &point);
-    EXPECT_EQ(42, point.x());
-    EXPECT_EQ(48, point.y());
-
-    point.SetPoint(42, 48);
-    View::ConvertPointToView(child, child_child, &point);
-    EXPECT_EQ(5, point.x());
-    EXPECT_EQ(5, point.y());
-  }
-
-  // Conversions from top_view to child with a value that should be negative.
-  // This ensures we don't round up with negative numbers.
-  {
-    gfx::Point point(6, 18);
-    View::ConvertPointToView(&top_view, child, &point);
-    EXPECT_EQ(-1, point.x());
-    EXPECT_EQ(-1, point.y());
-  }
-}
-
-// Tests conversion methods for rectangles.
-TEST_F(ViewTest, ConvertRectWithTransform) {
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(50, 50, 650, 650);
-  widget->Init(params);
-  View* root = widget->GetRootView();
-
-  TestView* v1 = new TestView;
-  TestView* v2 = new TestView;
-  root->AddChildView(v1);
-  v1->AddChildView(v2);
-
-  v1->SetBounds(10, 10, 500, 500);
-  v2->SetBounds(20, 20, 100, 200);
-
-  // |v2| now occupies (30, 30) to (130, 230) in |widget|
-  gfx::Rect rect(5, 5, 15, 40);
-  EXPECT_EQ(gfx::Rect(25, 25, 15, 40), v2->ConvertRectToParent(rect));
-  EXPECT_EQ(gfx::Rect(35, 35, 15, 40), v2->ConvertRectToWidget(rect));
-
-  // Rotate |v2|
-  ui::Transform t2;
-  RotateCounterclockwise(t2);
-  t2.SetTranslateY(100.0f);
-  v2->SetTransform(t2);
-
-  // |v2| now occupies (30, 30) to (230, 130) in |widget|
-  EXPECT_EQ(gfx::Rect(25, 100, 40, 15), v2->ConvertRectToParent(rect));
-  EXPECT_EQ(gfx::Rect(35, 110, 40, 15), v2->ConvertRectToWidget(rect));
-
-  // Scale down |v1|
-  ui::Transform t1;
-  t1.SetScale(0.5, 0.5);
-  v1->SetTransform(t1);
-
-  // The rectangle should remain the same for |v1|.
-  EXPECT_EQ(gfx::Rect(25, 100, 40, 15), v2->ConvertRectToParent(rect));
-
-  // |v2| now occupies (20, 20) to (120, 70) in |widget|
-  // There are some rounding of floating values here. These values may change if
-  // floating operations are improved/changed.
-  EXPECT_EQ(gfx::Rect(22, 60, 20, 7), v2->ConvertRectToWidget(rect));
-
-  widget->CloseNow();
-}
-
-class ObserverView : public View {
- public:
-  ObserverView();
-  virtual ~ObserverView();
-
-  void ResetTestState();
-
-  bool child_added() const { return child_added_; }
-  bool child_removed() const { return child_removed_; }
-  const View* parent_view() const { return parent_view_; }
-  const View* child_view() const { return child_view_; }
-
- private:
-  // View:
-  virtual void ViewHierarchyChanged(bool is_add,
-                                    View* parent,
-                                    View* child) OVERRIDE;
-
-  bool child_added_;
-  bool child_removed_;
-  View* parent_view_;
-  View* child_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(ObserverView);
-};
-
-ObserverView::ObserverView()
-    : child_added_(false),
-      child_removed_(false),
-      parent_view_(NULL),
-      child_view_(NULL) {
-}
-
-ObserverView::~ObserverView() {}
-
-void ObserverView::ResetTestState() {
-  child_added_ = false;
-  child_removed_ = false;
-  parent_view_ = NULL;
-  child_view_ = NULL;
-}
-
-void ObserverView::ViewHierarchyChanged(bool is_add,
-                                        View* parent,
-                                        View* child) {
-  if (is_add)
-    child_added_ = true;
-  else
-    child_removed_ = true;
-
-  parent_view_ = parent;
-  child_view_ = child;
-}
-
-// Verifies that the ViewHierarchyChanged() notification is sent correctly when
-// a child view is added or removed to all the views in the hierarchy (up and
-// down).
-// The tree looks like this:
-// v1
-// +-- v2
-//     +-- v3
-TEST_F(ViewTest, ViewHierarchyChanged) {
-  ObserverView v1;
-
-  ObserverView* v3 = new ObserverView();
-
-  // Add |v3| to |v2|.
-  scoped_ptr<ObserverView> v2(new ObserverView());
-  v2->AddChildView(v3);
-
-  // Make sure both |v2| and |v3| receive the ViewHierarchyChanged()
-  // notification.
-  EXPECT_TRUE(v2->child_added());
-  EXPECT_FALSE(v2->child_removed());
-  EXPECT_EQ(v2.get(), v2->parent_view());
-  EXPECT_EQ(v3, v2->child_view());
-
-  EXPECT_TRUE(v3->child_added());
-  EXPECT_FALSE(v3->child_removed());
-  EXPECT_EQ(v2.get(), v3->parent_view());
-  EXPECT_EQ(v3, v3->child_view());
-
-  // Reset everything to the initial state.
-  v2->ResetTestState();
-  v3->ResetTestState();
-
-  // Add |v2| to v1.
-  v1.AddChildView(v2.get());
-
-  // Verifies that |v2| is the child view *added* and the parent view is |v1|.
-  // Make sure all the views (v1, v2, v3) received _that_ information.
-  EXPECT_TRUE(v1.child_added());
-  EXPECT_FALSE(v1.child_removed());
-  EXPECT_EQ(&v1, v1.parent_view());
-  EXPECT_EQ(v2.get(), v1.child_view());
-
-  EXPECT_TRUE(v2->child_added());
-  EXPECT_FALSE(v2->child_removed());
-  EXPECT_EQ(&v1, v2->parent_view());
-  EXPECT_EQ(v2.get(), v2->child_view());
-
-  EXPECT_TRUE(v3->child_added());
-  EXPECT_FALSE(v3->child_removed());
-  EXPECT_EQ(&v1, v3->parent_view());
-  EXPECT_EQ(v2.get(), v3->child_view());
-
-  // Reset everything to the initial state.
-  v1.ResetTestState();
-  v2->ResetTestState();
-  v3->ResetTestState();
-
-  // Remove |v2| from |v1|.
-  v1.RemoveChildView(v2.get());
-
-  // Verifies that |v2| is the child view *removed* and the parent view is |v1|.
-  // Make sure all the views (v1, v2, v3) received _that_ information.
-  EXPECT_FALSE(v1.child_added());
-  EXPECT_TRUE(v1.child_removed());
-  EXPECT_EQ(&v1, v1.parent_view());
-  EXPECT_EQ(v2.get(), v1.child_view());
-
-  EXPECT_FALSE(v2->child_added());
-  EXPECT_TRUE(v2->child_removed());
-  EXPECT_EQ(&v1, v2->parent_view());
-  EXPECT_EQ(v2.get(), v2->child_view());
-
-  EXPECT_FALSE(v3->child_added());
-  EXPECT_TRUE(v3->child_removed());
-  EXPECT_EQ(&v1, v3->parent_view());
-  EXPECT_EQ(v3, v3->child_view());
-}
-
-// Verifies if the child views added under the root are all deleted when calling
-// RemoveAllChildViews.
-// The tree looks like this:
-// root
-// +-- child1
-//     +-- foo
-//         +-- bar0
-//         +-- bar1
-//         +-- bar2
-// +-- child2
-// +-- child3
-TEST_F(ViewTest, RemoveAllChildViews) {
-  View root;
-
-  View* child1 = new View;
-  root.AddChildView(child1);
-
-  for (int i = 0; i < 2; ++i)
-    root.AddChildView(new View);
-
-  View* foo = new View;
-  child1->AddChildView(foo);
-
-  // Add some nodes to |foo|.
-  for (int i = 0; i < 3; ++i)
-    foo->AddChildView(new View);
-
-  EXPECT_EQ(3, root.child_count());
-  EXPECT_EQ(1, child1->child_count());
-  EXPECT_EQ(3, foo->child_count());
-
-  // Now remove all child views from root.
-  root.RemoveAllChildViews(true);
-
-  EXPECT_EQ(0, root.child_count());
-  EXPECT_FALSE(root.has_children());
-}
-
-TEST_F(ViewTest, Contains) {
-  View v1;
-  View* v2 = new View;
-  View* v3 = new View;
-
-  v1.AddChildView(v2);
-  v2->AddChildView(v3);
-
-  EXPECT_FALSE(v1.Contains(NULL));
-  EXPECT_TRUE(v1.Contains(&v1));
-  EXPECT_TRUE(v1.Contains(v2));
-  EXPECT_TRUE(v1.Contains(v3));
-
-  EXPECT_FALSE(v2->Contains(NULL));
-  EXPECT_TRUE(v2->Contains(v2));
-  EXPECT_FALSE(v2->Contains(&v1));
-  EXPECT_TRUE(v2->Contains(v3));
-
-  EXPECT_FALSE(v3->Contains(NULL));
-  EXPECT_TRUE(v3->Contains(v3));
-  EXPECT_FALSE(v3->Contains(&v1));
-  EXPECT_FALSE(v3->Contains(v2));
-}
-
-// Verifies if GetIndexOf() returns the correct index for the specified child
-// view.
-// The tree looks like this:
-// root
-// +-- child1
-//     +-- foo1
-// +-- child2
-TEST_F(ViewTest, GetIndexOf) {
-  View root;
-
-  View* child1 = new View;
-  root.AddChildView(child1);
-
-  View* child2 = new View;
-  root.AddChildView(child2);
-
-  View* foo1 = new View;
-  child1->AddChildView(foo1);
-
-  EXPECT_EQ(-1, root.GetIndexOf(NULL));
-  EXPECT_EQ(-1, root.GetIndexOf(&root));
-  EXPECT_EQ(0, root.GetIndexOf(child1));
-  EXPECT_EQ(1, root.GetIndexOf(child2));
-  EXPECT_EQ(-1, root.GetIndexOf(foo1));
-
-  EXPECT_EQ(-1, child1->GetIndexOf(NULL));
-  EXPECT_EQ(-1, child1->GetIndexOf(&root));
-  EXPECT_EQ(-1, child1->GetIndexOf(child1));
-  EXPECT_EQ(-1, child1->GetIndexOf(child2));
-  EXPECT_EQ(0, child1->GetIndexOf(foo1));
-
-  EXPECT_EQ(-1, child2->GetIndexOf(NULL));
-  EXPECT_EQ(-1, child2->GetIndexOf(&root));
-  EXPECT_EQ(-1, child2->GetIndexOf(child2));
-  EXPECT_EQ(-1, child2->GetIndexOf(child1));
-  EXPECT_EQ(-1, child2->GetIndexOf(foo1));
-}
-
-// Verifies that the child views can be reordered correctly.
-TEST_F(ViewTest, ReorderChildren) {
-  View root;
-
-  View* child = new View();
-  root.AddChildView(child);
-
-  View* foo1 = new View();
-  child->AddChildView(foo1);
-  View* foo2 = new View();
-  child->AddChildView(foo2);
-  View* foo3 = new View();
-  child->AddChildView(foo3);
-  foo1->set_focusable(true);
-  foo2->set_focusable(true);
-  foo3->set_focusable(true);
-
-  ASSERT_EQ(0, child->GetIndexOf(foo1));
-  ASSERT_EQ(1, child->GetIndexOf(foo2));
-  ASSERT_EQ(2, child->GetIndexOf(foo3));
-  ASSERT_EQ(foo2, foo1->GetNextFocusableView());
-  ASSERT_EQ(foo3, foo2->GetNextFocusableView());
-  ASSERT_EQ(NULL, foo3->GetNextFocusableView());
-
-  // Move |foo2| at the end.
-  child->ReorderChildView(foo2, -1);
-  ASSERT_EQ(0, child->GetIndexOf(foo1));
-  ASSERT_EQ(1, child->GetIndexOf(foo3));
-  ASSERT_EQ(2, child->GetIndexOf(foo2));
-  ASSERT_EQ(foo3, foo1->GetNextFocusableView());
-  ASSERT_EQ(foo2, foo3->GetNextFocusableView());
-  ASSERT_EQ(NULL, foo2->GetNextFocusableView());
-
-  // Move |foo1| at the end.
-  child->ReorderChildView(foo1, -1);
-  ASSERT_EQ(0, child->GetIndexOf(foo3));
-  ASSERT_EQ(1, child->GetIndexOf(foo2));
-  ASSERT_EQ(2, child->GetIndexOf(foo1));
-  ASSERT_EQ(NULL, foo1->GetNextFocusableView());
-  ASSERT_EQ(foo2, foo1->GetPreviousFocusableView());
-  ASSERT_EQ(foo2, foo3->GetNextFocusableView());
-  ASSERT_EQ(foo1, foo2->GetNextFocusableView());
-
-  // Move |foo2| to the front.
-  child->ReorderChildView(foo2, 0);
-  ASSERT_EQ(0, child->GetIndexOf(foo2));
-  ASSERT_EQ(1, child->GetIndexOf(foo3));
-  ASSERT_EQ(2, child->GetIndexOf(foo1));
-  ASSERT_EQ(NULL, foo1->GetNextFocusableView());
-  ASSERT_EQ(foo3, foo1->GetPreviousFocusableView());
-  ASSERT_EQ(foo3, foo2->GetNextFocusableView());
-  ASSERT_EQ(foo1, foo3->GetNextFocusableView());
-}
-
-// Verifies that GetViewByID returns the correctly child view from the specified
-// ID.
-// The tree looks like this:
-// v1
-// +-- v2
-//     +-- v3
-//     +-- v4
-TEST_F(ViewTest, GetViewByID) {
-  View v1;
-  const int kV1ID = 1;
-  v1.set_id(kV1ID);
-
-  View v2;
-  const int kV2ID = 2;
-  v2.set_id(kV2ID);
-
-  View v3;
-  const int kV3ID = 3;
-  v3.set_id(kV3ID);
-
-  View v4;
-  const int kV4ID = 4;
-  v4.set_id(kV4ID);
-
-  const int kV5ID = 5;
-
-  v1.AddChildView(&v2);
-  v2.AddChildView(&v3);
-  v2.AddChildView(&v4);
-
-  EXPECT_EQ(&v1, v1.GetViewByID(kV1ID));
-  EXPECT_EQ(&v2, v1.GetViewByID(kV2ID));
-  EXPECT_EQ(&v4, v1.GetViewByID(kV4ID));
-
-  EXPECT_EQ(NULL, v1.GetViewByID(kV5ID));  // No V5 exists.
-  EXPECT_EQ(NULL, v2.GetViewByID(kV1ID));  // It can get only from child views.
-
-  const int kGroup = 1;
-  v3.SetGroup(kGroup);
-  v4.SetGroup(kGroup);
-
-  View::Views views;
-  v1.GetViewsInGroup(kGroup, &views);
-  EXPECT_EQ(2U, views.size());
-
-  View::Views::const_iterator i(std::find(views.begin(), views.end(), &v3));
-  EXPECT_NE(views.end(), i);
-
-  i = std::find(views.begin(), views.end(), &v4);
-  EXPECT_NE(views.end(), i);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Layers
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined(VIEWS_COMPOSITOR)
-
-namespace {
-
-// Test implementation of LayerAnimator.
-class TestLayerAnimator : public ui::LayerAnimator {
- public:
-  TestLayerAnimator();
-
-  const gfx::Rect& last_bounds() const { return last_bounds_; }
-
-  // LayerAnimator.
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
-
- private:
-  gfx::Rect last_bounds_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestLayerAnimator);
-};
-
-TestLayerAnimator::TestLayerAnimator()
-    : ui::LayerAnimator(base::TimeDelta::FromMilliseconds(0)) {
-}
-
-void TestLayerAnimator::SetBounds(const gfx::Rect& bounds) {
-  last_bounds_ = bounds;
-}
-
-}  // namespace
-
-class ViewLayerTest : public ViewsTestBase {
- public:
-  ViewLayerTest() : widget_(NULL), old_use_acceleration_(false) {}
-
-  virtual ~ViewLayerTest() {
-  }
-
-  // Returns the Layer used by the RootView.
-  ui::Layer* GetRootLayer() {
-#if defined(USE_AURA)
-    ui::Layer* root_layer = NULL;
-    gfx::Point origin;
-    widget()->CalculateOffsetToAncestorWithLayer(&origin, &root_layer);
-    return root_layer;
-#else
-    return widget()->GetRootView()->layer();
-#endif
-  }
-
-  virtual void SetUp() OVERRIDE {
-    ViewTest::SetUp();
-    old_use_acceleration_ = View::get_use_acceleration_when_possible();
-    View::set_use_acceleration_when_possible(true);
-
-    ui::TestTexture::reset_live_count();
-
-    widget_ = new Widget;
-    Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-    params.bounds = gfx::Rect(50, 50, 200, 200);
-    widget_->Init(params);
-    widget_->Show();
-    widget_->GetRootView()->SetBounds(0, 0, 200, 200);
-  }
-
-  virtual void TearDown() OVERRIDE {
-    View::set_use_acceleration_when_possible(old_use_acceleration_);
-    widget_->CloseNow();
-    Widget::SetPureViews(false);
-    ViewsTestBase::TearDown();
-  }
-
-  Widget* widget() { return widget_; }
-
- private:
-  Widget* widget_;
-  bool old_use_acceleration_;
-};
-
-#if !defined(USE_AURA)
-// This test assumes a particular layer hierarchy that isn't valid for aura.
-// Ensures the RootView has a layer and its set up correctly.
-TEST_F(ViewLayerTest, RootState) {
-  ui::Layer* layer = widget()->GetRootView()->layer();
-  ASSERT_TRUE(layer);
-  EXPECT_FALSE(layer->parent());
-  EXPECT_EQ(0u, layer->children().size());
-  EXPECT_FALSE(layer->transform().HasChange());
-  EXPECT_EQ(widget()->GetRootView()->bounds(), layer->bounds());
-  EXPECT_TRUE(layer->GetCompositor() != NULL);
-}
-
-// Verifies that the complete bounds of a texture are updated if the texture
-// needs to be refreshed and paint with a clip is invoked.
-// This test invokes OnNativeWidgetPaintAccelerated, which is not used by aura.
-TEST_F(ViewLayerTest, PaintAll) {
-  View* view = widget()->GetRootView();
-  ui::Layer* layer = GetRootLayer();
-  view->SetBounds(0, 0, 200, 200);
-  widget()->OnNativeWidgetPaintAccelerated(gfx::Rect(0, 0, 1, 1));
-  ASSERT_TRUE(layer != NULL);
-  const ui::TestTexture* texture =
-      static_cast<const ui::TestTexture*>(layer->texture());
-  ASSERT_TRUE(texture != NULL);
-  EXPECT_EQ(view->GetLocalBounds(), texture->bounds_of_last_paint());
-}
-#endif
-
-TEST_F(ViewLayerTest, LayerToggling) {
-  // Because we lazily create textures the calls to DrawTree are necessary to
-  // ensure we trigger creation of textures.
-#if defined(USE_AURA)
-  ui::Layer* root_layer = NULL;
-  gfx::Point origin;
-  widget()->CalculateOffsetToAncestorWithLayer(&origin, &root_layer);
-#else
-  ui::Layer* root_layer = widget()->GetRootView()->layer();
-#endif
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  // TODO(piman): with the webkit compositor, we don't create Textures on
-  // Layers. We're not supposed to be calling Layer::DrawTree. This test needs
-  // refactoring to fully work in that case.
-  root_layer->DrawTree();
-  ui::TestTexture::reset_live_count();
-#endif
-
-  // Create v1, give it a bounds and verify everything is set up correctly.
-  View* v1 = new View;
-  v1->SetPaintToLayer(true);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(0, ui::TestTexture::live_count());
-#endif
-  EXPECT_TRUE(v1->layer() != NULL);
-  v1->SetBounds(20, 30, 140, 150);
-  content_view->AddChildView(v1);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(1, ui::TestTexture::live_count());
-#endif
-  ASSERT_TRUE(v1->layer() != NULL);
-  EXPECT_EQ(root_layer, v1->layer()->parent());
-  EXPECT_EQ(gfx::Rect(20, 30, 140, 150), v1->layer()->bounds());
-
-  // Create v2 as a child of v1 and do basic assertion testing.
-  View* v2 = new View;
-  v1->AddChildView(v2);
-  EXPECT_TRUE(v2->layer() == NULL);
-  v2->SetBounds(10, 20, 30, 40);
-  v2->SetPaintToLayer(true);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(2, ui::TestTexture::live_count());
-#endif
-  ASSERT_TRUE(v2->layer() != NULL);
-  EXPECT_EQ(v1->layer(), v2->layer()->parent());
-  EXPECT_EQ(gfx::Rect(10, 20, 30, 40), v2->layer()->bounds());
-
-  // Turn off v1s layer. v2 should still have a layer but its parent should have
-  // changed.
-  v1->SetPaintToLayer(false);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(1, ui::TestTexture::live_count());
-#endif
-  EXPECT_TRUE(v1->layer() == NULL);
-  EXPECT_TRUE(v2->layer() != NULL);
-  EXPECT_EQ(root_layer, v2->layer()->parent());
-  ASSERT_EQ(1u, root_layer->children().size());
-  EXPECT_EQ(root_layer->children()[0], v2->layer());
-  // The bounds of the layer should have changed to be relative to the root view
-  // now.
-  EXPECT_EQ(gfx::Rect(30, 50, 30, 40), v2->layer()->bounds());
-
-  // Make v1 have a layer again and verify v2s layer is wired up correctly.
-  ui::Transform transform;
-  transform.SetScale(2.0f, 2.0f);
-  v1->SetTransform(transform);
-#if !defined(USE_WEBKIT_COMPOSITOR)
-  root_layer->DrawTree();
-  EXPECT_EQ(2, ui::TestTexture::live_count());
-#endif
-  EXPECT_TRUE(v1->layer() != NULL);
-  EXPECT_TRUE(v2->layer() != NULL);
-  EXPECT_EQ(root_layer, v1->layer()->parent());
-  EXPECT_EQ(v1->layer(), v2->layer()->parent());
-  ASSERT_EQ(1u, root_layer->children().size());
-  EXPECT_EQ(root_layer->children()[0], v1->layer());
-  ASSERT_EQ(1u, v1->layer()->children().size());
-  EXPECT_EQ(v1->layer()->children()[0], v2->layer());
-  EXPECT_EQ(gfx::Rect(10, 20, 30, 40), v2->layer()->bounds());
-}
-
-// Verifies turning on a layer wires up children correctly.
-TEST_F(ViewLayerTest, NestedLayerToggling) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  // Create v1, give it a bounds and verify everything is set up correctly.
-  View* v1 = new View;
-  content_view->AddChildView(v1);
-  v1->SetBounds(20, 30, 140, 150);
-
-  View* v2 = new View;
-  v1->AddChildView(v2);
-
-  View* v3 = new View;
-  v3->SetPaintToLayer(true);
-  v2->AddChildView(v3);
-  ASSERT_TRUE(v3->layer() != NULL);
-
-  // At this point we have v1-v2-v3. v3 has a layer, v1 and v2 don't.
-
-  v1->SetPaintToLayer(true);
-  EXPECT_EQ(v1->layer(), v3->layer()->parent());
-}
-
-TEST_F(ViewLayerTest, LayerAnimator) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* v1 = new View;
-  content_view->AddChildView(v1);
-  v1->SetPaintToLayer(true);
-  EXPECT_TRUE(v1->layer() != NULL);
-
-  TestLayerAnimator* animator = new TestLayerAnimator();
-  v1->layer()->SetAnimator(animator);
-
-  gfx::Rect bounds(1, 2, 3, 4);
-  v1->SetBoundsRect(bounds);
-  EXPECT_EQ(bounds, animator->last_bounds());
-  // TestLayerAnimator doesn't update the layer.
-  EXPECT_NE(bounds, v1->layer()->bounds());
-}
-
-// Verifies the bounds of a layer are updated if the bounds of ancestor that
-// doesn't have a layer change.
-TEST_F(ViewLayerTest, BoundsChangeWithLayer) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* v1 = new View;
-  content_view->AddChildView(v1);
-  v1->SetBounds(20, 30, 140, 150);
-
-  View* v2 = new View;
-  v2->SetBounds(10, 11, 40, 50);
-  v1->AddChildView(v2);
-  v2->SetPaintToLayer(true);
-  ASSERT_TRUE(v2->layer() != NULL);
-  EXPECT_EQ(gfx::Rect(30, 41, 40, 50), v2->layer()->bounds());
-
-  v1->SetPosition(gfx::Point(25, 36));
-  EXPECT_EQ(gfx::Rect(35, 47, 40, 50), v2->layer()->bounds());
-
-  v2->SetPosition(gfx::Point(11, 12));
-  EXPECT_EQ(gfx::Rect(36, 48, 40, 50), v2->layer()->bounds());
-
-  // Bounds of the layer should change even if the view is not invisible.
-  v1->SetVisible(false);
-  v1->SetPosition(gfx::Point(20, 30));
-  EXPECT_EQ(gfx::Rect(31, 42, 40, 50), v2->layer()->bounds());
-
-  v2->SetVisible(false);
-  v2->SetBounds(10, 11, 20, 30);
-  EXPECT_EQ(gfx::Rect(30, 41, 20, 30), v2->layer()->bounds());
-}
-
-// Makes sure a transform persists after toggling the visibility.
-TEST_F(ViewLayerTest, ToggleVisibilityWithTransform) {
-  View* view = new View;
-  ui::Transform transform;
-  transform.SetScale(2.0f, 2.0f);
-  view->SetTransform(transform);
-  widget()->SetContentsView(view);
-  EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
-
-  view->SetVisible(false);
-  EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
-
-  view->SetVisible(true);
-  EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
-}
-
-// Verifies a transform persists after removing/adding a view with a transform.
-TEST_F(ViewLayerTest, ResetTransformOnLayerAfterAdd) {
-  View* view = new View;
-  ui::Transform transform;
-  transform.SetScale(2.0f, 2.0f);
-  view->SetTransform(transform);
-  widget()->SetContentsView(view);
-  EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
-  ASSERT_TRUE(view->layer() != NULL);
-  EXPECT_EQ(2.0f, view->layer()->transform().matrix().get(0, 0));
-
-  View* parent = view->parent();
-  parent->RemoveChildView(view);
-  parent->AddChildView(view);
-
-  EXPECT_EQ(2.0f, view->GetTransform().matrix().get(0, 0));
-  ASSERT_TRUE(view->layer() != NULL);
-  EXPECT_EQ(2.0f, view->layer()->transform().matrix().get(0, 0));
-}
-
-// Makes sure that layer visibility is correct after toggling View visibility.
-TEST_F(ViewLayerTest, ToggleVisibilityWithLayer) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  // The view isn't attached to a widget or a parent view yet. But it should
-  // still have a layer, but the layer should not be attached to the root
-  // layer.
-  View* v1 = new View;
-  v1->SetPaintToLayer(true);
-  EXPECT_TRUE(v1->layer());
-  EXPECT_FALSE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
-                               v1->layer()));
-
-  // Once the view is attached to a widget, its layer should be attached to the
-  // root layer and visible.
-  content_view->AddChildView(v1);
-  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
-                              v1->layer()));
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-
-  v1->SetVisible(false);
-  EXPECT_FALSE(v1->layer()->IsDrawn());
-
-  v1->SetVisible(true);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-
-  widget()->Hide();
-  EXPECT_FALSE(v1->layer()->IsDrawn());
-
-  widget()->Show();
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-}
-
-// Test that a hole in a layer is correctly created regardless of whether
-// the opacity attribute is set before or after the layer is created.
-TEST_F(ViewLayerTest, ToggleOpacityWithLayer) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* parent_view = new View;
-  content_view->AddChildView(parent_view);
-  parent_view->SetPaintToLayer(true);
-  parent_view->SetBounds(0, 0, 400, 400);
-
-  View* child_view = new View;
-  child_view->SetBounds(50, 50, 100, 100);
-  parent_view->AddChildView(child_view);
-
-  widget()->GetCompositor()->Draw(false);
-
-  ASSERT_TRUE(child_view->layer() == NULL);
-  child_view->SetPaintToLayer(true);
-  child_view->SetFillsBoundsOpaquely(true);
-  widget()->GetCompositor()->Draw(false);
-  ASSERT_TRUE(child_view->layer());
-  EXPECT_EQ(
-      gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
-
-  child_view->SetFillsBoundsOpaquely(false);
-  widget()->GetCompositor()->Draw(false);
-  EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
-}
-
-// Test that a hole in a layer always corresponds to the bounds of opaque
-// layers.
-TEST_F(ViewLayerTest, MultipleOpaqueLayers) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* parent_view = new View;
-  parent_view->SetPaintToLayer(true);
-  parent_view->SetBounds(0, 0, 400, 400);
-  content_view->AddChildView(parent_view);
-
-  View* child_view1 = new View;
-  child_view1->SetPaintToLayer(true);
-  child_view1->SetFillsBoundsOpaquely(true);
-  child_view1->SetBounds(50, 50, 100, 100);
-  parent_view->AddChildView(child_view1);
-
-  View* child_view2 = new View;
-  child_view2->SetPaintToLayer(true);
-  child_view2->SetFillsBoundsOpaquely(false);
-  child_view2->SetBounds(150, 150, 200, 200);
-  parent_view->AddChildView(child_view2);
-
-  widget()->GetCompositor()->Draw(false);
-
-  // Only child_view1 is opaque
-  EXPECT_EQ(
-      gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
-
-  // Both child views are opaque
-  child_view2->SetFillsBoundsOpaquely(true);
-  widget()->GetCompositor()->Draw(false);
-  EXPECT_TRUE(
-      gfx::Rect(50, 50, 100, 100) == parent_view->layer()->hole_rect() ||
-      gfx::Rect(150, 150, 200, 200) == parent_view->layer()->hole_rect());
-
-  // Only child_view2 is opaque
-  delete child_view1;
-  EXPECT_EQ(
-      gfx::Rect(150, 150, 200, 200), parent_view->layer()->hole_rect());
-}
-
-// Makes sure that opacity of layer persists after toggling visibilty.
-TEST_F(ViewLayerTest, ToggleVisibilityWithOpaqueLayer) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* parent_view = new View;
-  parent_view->SetPaintToLayer(true);
-  parent_view->SetBounds(0, 0, 400, 400);
-  content_view->AddChildView(parent_view);
-
-  parent_view->SetPaintToLayer(true);
-  parent_view->SetBounds(0, 0, 400, 400);
-
-  View* child_view = new View;
-  child_view->SetBounds(50, 50, 100, 100);
-  child_view->SetPaintToLayer(true);
-  child_view->SetFillsBoundsOpaquely(true);
-  parent_view->AddChildView(child_view);
-  widget()->GetCompositor()->Draw(false);
-  EXPECT_EQ(
-       gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
-
-  child_view->SetVisible(false);
-  widget()->GetCompositor()->Draw(false);
-  EXPECT_TRUE(parent_view->layer()->hole_rect().IsEmpty());
-
-  child_view->SetVisible(true);
-  widget()->GetCompositor()->Draw(false);
-  EXPECT_EQ(
-      gfx::Rect(50, 50, 100, 100), parent_view->layer()->hole_rect());
-}
-
-// Tests that the layers in the subtree are orphaned after a View is removed
-// from the parent.
-TEST_F(ViewLayerTest, OrphanLayerAfterViewRemove) {
-  View* content_view = new View;
-  widget()->SetContentsView(content_view);
-
-  View* v1 = new View;
-  content_view->AddChildView(v1);
-
-  View* v2 = new View;
-  v1->AddChildView(v2);
-  v2->SetPaintToLayer(true);
-  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
-                              v2->layer()));
-  EXPECT_TRUE(v2->layer()->IsDrawn());
-
-  content_view->RemoveChildView(v1);
-  EXPECT_FALSE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
-                               v2->layer()));
-
-  // Reparent |v2|.
-  content_view->AddChildView(v2);
-  EXPECT_TRUE(LayerIsAncestor(widget()->GetCompositor()->root_layer(),
-                              v2->layer()));
-  EXPECT_TRUE(v2->layer()->IsDrawn());
-}
-
-class PaintTrackingView : public View {
- public:
-  PaintTrackingView() : painted_(false) {
-  }
-
-  bool painted() const { return painted_; }
-  void set_painted(bool value) { painted_ = value; }
-
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
-    painted_ = true;
-  }
-
- private:
-  bool painted_;
-
-  DISALLOW_COPY_AND_ASSIGN(PaintTrackingView);
-};
-
-#if !defined(USE_WEBKIT_COMPOSITOR)
-// TODO(piman): this test relies on the way the non-webkit compositor works.
-// Layer::DrawTree should not be called with the webkit compositor. In the
-// WebKit case, it needs to go through the "real" compositor (not the test one)
-// to do the paints on the layer/views.
-
-// Makes sure child views with layers aren't painted when paint starts at an
-// ancestor.
-TEST_F(ViewLayerTest, DontPaintChildrenWithLayers) {
-  PaintTrackingView* content_view = new PaintTrackingView;
-  widget()->SetContentsView(content_view);
-  content_view->SetPaintToLayer(true);
-  GetRootLayer()->DrawTree();
-  GetRootLayer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
-  content_view->set_painted(false);
-  // content_view no longer has a dirty rect. Paint from the root and make sure
-  // PaintTrackingView isn't painted.
-  GetRootLayer()->DrawTree();
-  EXPECT_FALSE(content_view->painted());
-
-  // Make content_view have a dirty rect, paint the layers and make sure
-  // PaintTrackingView is painted.
-  content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
-  GetRootLayer()->DrawTree();
-  EXPECT_TRUE(content_view->painted());
-}
-#endif
-
-// Tests that the visibility of child layers are updated correctly when a View's
-// visibility changes.
-TEST_F(ViewLayerTest, VisibilityChildLayers) {
-  View* v1 = new View;
-  v1->SetPaintToLayer(true);
-  widget()->SetContentsView(v1);
-
-  View* v2 = new View;
-  v1->AddChildView(v2);
-
-  View* v3 = new View;
-  v2->AddChildView(v3);
-  v3->SetVisible(false);
-
-  View* v4 = new View;
-  v4->SetPaintToLayer(true);
-  v3->AddChildView(v4);
-
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_FALSE(v4->layer()->IsDrawn());
-
-  v2->SetVisible(false);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_FALSE(v4->layer()->IsDrawn());
-
-  v2->SetVisible(true);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_FALSE(v4->layer()->IsDrawn());
-
-  v2->SetVisible(false);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_FALSE(v4->layer()->IsDrawn());
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(v1, v1->layer()));
-
-  v3->SetVisible(true);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_FALSE(v4->layer()->IsDrawn());
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(v1, v1->layer()));
-
-  // Reparent |v3| to |v1|.
-  v1->AddChildView(v3);
-  EXPECT_TRUE(v1->layer()->IsDrawn());
-  EXPECT_TRUE(v4->layer()->IsDrawn());
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(v1, v1->layer()));
-}
-
-// This test creates a random View tree, and then randomly reorders child views,
-// reparents views etc. Unrelated changes can appear to break this test. So
-// marking this as FLAKY.
-TEST_F(ViewLayerTest, FLAKY_ViewLayerTreesInSync) {
-  View* content = new View;
-  content->SetPaintToLayer(true);
-  widget()->SetContentsView(content);
-  widget()->Show();
-
-  ConstructTree(content, 5);
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
-
-  ScrambleTree(content);
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
-
-  ScrambleTree(content);
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
-
-  ScrambleTree(content);
-  EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
-}
-
-#endif  // VIEWS_COMPOSITOR
-
-}  // namespace views