Revert of "Added common layout framework for system menu rows."

ui/views/test/test_views.cc

 // Copyright 2013 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 "ui/views/test/test_views.h"
 
 #include "ui/events/event.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
-StaticSizedView::StaticSizedView(const gfx::Size& preferred_size)
+StaticSizedView::StaticSizedView(const gfx::Size& size)
     // Default GetMinimumSize() is GetPreferredSize(). Default GetMaximumSize()
     // is 0x0.
-    : preferred_size_(preferred_size),
-      minimum_size_(preferred_size) {}
+    : size_(size),
+      minimum_size_(size) {
+}
 
 StaticSizedView::~StaticSizedView() {}
 
 gfx::Size StaticSizedView::GetPreferredSize() const {
-  return preferred_size_;
+  return size_;
 }
 
 gfx::Size StaticSizedView::GetMinimumSize() const {
   return minimum_size_;
 }
 
 gfx::Size StaticSizedView::GetMaximumSize() const {
   return maximum_size_;
 }
 
@@ skipping 66 matching lines @@
 }
 
 void EventCountView::RecordEvent(ui::Event* event) {
   ++event_count_[event->type()];
   last_flags_ = event->flags();
   if (handle_mode_ == CONSUME_EVENTS)
     event->SetHandled();
 }
 
 }  // namespace views