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

ui/views/test/test_views.h

 // 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.
 
 #ifndef UI_VIEWS_TEST_TEST_VIEWS_H_
 #define UI_VIEWS_TEST_TEST_VIEWS_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "ui/events/event_constants.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 // A view that requests a set amount of space.
 class StaticSizedView : public View {
  public:
-  explicit StaticSizedView(const gfx::Size& size);
+  explicit StaticSizedView(const gfx::Size& preferred_size = gfx::Size());
   ~StaticSizedView() override;
 
   void set_minimum_size(const gfx::Size& minimum_size) {
     minimum_size_ = minimum_size;
   }
 
   void set_maximum_size(const gfx::Size& maximum_size) {
     maximum_size_ = maximum_size;
   }
 
   // View overrides:
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
 
  private:
-  gfx::Size size_;
+  gfx::Size preferred_size_;
   gfx::Size minimum_size_;
   gfx::Size maximum_size_;
 
   DISALLOW_COPY_AND_ASSIGN(StaticSizedView);
 };
 
 // A view that accomodates testing layouts that use GetHeightForWidth.
 class ProportionallySizedView : public View {
  public:
   explicit ProportionallySizedView(int factor);
@@ skipping 64 matching lines @@
   std::map<ui::EventType, int> event_count_;
   int last_flags_;
   HandleMode handle_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCountView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_TEST_VIEWS_H_