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

ui/views/test/test_views.cc

Index: ui/views/test/test_views.cc
diff --git a/ui/views/test/test_views.cc b/ui/views/test/test_views.cc
index d0ad7d53186134e23fd4e6e6f76a2b7f9ded69d7..78239f384a4993997cda723d7da46b0b33fba3ef 100644
--- a/ui/views/test/test_views.cc
+++ b/ui/views/test/test_views.cc
@@ -10,17 +10,16 @@
 
 namespace views {
 
-StaticSizedView::StaticSizedView(const gfx::Size& size)
+StaticSizedView::StaticSizedView(const gfx::Size& preferred_size)
     // Default GetMinimumSize() is GetPreferredSize(). Default GetMaximumSize()
     // is 0x0.
-    : size_(size),
-      minimum_size_(size) {
-}
+    : preferred_size_(preferred_size),
+      minimum_size_(preferred_size) {}
 
 StaticSizedView::~StaticSizedView() {}
 
 gfx::Size StaticSizedView::GetPreferredSize() const {
-  return size_;
+  return preferred_size_;
 }
 
 gfx::Size StaticSizedView::GetMinimumSize() const {