Revert of Added common layout framework for system menu rows.

ui/views/test/test_views.h

Index: ui/views/test/test_views.h
diff --git a/ui/views/test/test_views.h b/ui/views/test/test_views.h
index eaabcd0e0cdc108dfa5dd2f692ed073e0ec5d944..ef17c150dcb9ac7498a0e6209ffaee426f307641 100644
--- a/ui/views/test/test_views.h
+++ b/ui/views/test/test_views.h
@@ -16,7 +16,7 @@
 // A view that requests a set amount of space.
 class StaticSizedView : public View {
  public:
-  explicit StaticSizedView(const gfx::Size& preferred_size = gfx::Size());
+  explicit StaticSizedView(const gfx::Size& size);
   ~StaticSizedView() override;
 
   void set_minimum_size(const gfx::Size& minimum_size) {
@@ -33,7 +33,7 @@
   gfx::Size GetMaximumSize() const override;
 
  private:
-  gfx::Size preferred_size_;
+  gfx::Size size_;
   gfx::Size minimum_size_;
   gfx::Size maximum_size_;