[ash-md] Changed the system info row height to 40 (instead of 48).

ash/common/system/tray/tri_view_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "ash/common/system/tray/tri_view.h"
 #include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/insets.h"
@@ skipping 16 matching lines @@
   return std::move(layout);
 }
 
 }  // namespace
 
 class TriViewTest : public testing::Test {
  public:
   TriViewTest();
 
  protected:
+  // Convenience function to get the minimum height of |container|.
+  int GetMinHeight(TriView::Container container) const;
+
   // Returns the bounds of |child| in the coordinate space of
   // |tri_view_|.
   gfx::Rect GetBoundsInHost(const views::View* child) const;
 
   // Wrapper functions to access the internals of |tri_view_|.
   views::View* GetContainer(TriView::Container container) const;
 
   // The test target.
   std::unique_ptr<TriView> tri_view_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TriViewTest);
 };
 
 TriViewTest::TriViewTest() : tri_view_(base::MakeUnique<TriView>()) {}
 
+int TriViewTest::GetMinHeight(TriView::Container container) const {
+  return tri_view_->GetMinSize(container).height();
+}
+
 gfx::Rect TriViewTest::GetBoundsInHost(const views::View* child) const {
   gfx::RectF rect_f(child->bounds());
   views::View::ConvertRectToTarget(child, tri_view_.get(), &rect_f);
   return ToNearestRect(rect_f);
 }
 
 views::View* TriViewTest::GetContainer(TriView::Container container) const {
   return tri_view_->GetContainer(container);
 }
 
@@ skipping 286 matching lines @@
       new views::ProportionallySizedView(1);
   tri_view_->AddView(TriView::Container::START, child_view);
 
   child_view->SetPreferredWidth(1);
   EXPECT_EQ(child_view->GetPreferredSize(), child_view->size());
 
   child_view->SetPreferredWidth(2);
   EXPECT_EQ(child_view->GetPreferredSize(), child_view->size());
 }
 
+TEST_F(TriViewTest, SetMinHeight) {
+  const int kMinHeight = 10;
+
+  EXPECT_NE(kMinHeight, GetMinHeight(TriView::Container::START));
+  EXPECT_NE(kMinHeight, GetMinHeight(TriView::Container::CENTER));
+  EXPECT_NE(kMinHeight, GetMinHeight(TriView::Container::END));
+
+  tri_view_->SetMinHeight(kMinHeight);
+
+  EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::START));
+  EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::CENTER));
+  EXPECT_EQ(kMinHeight, GetMinHeight(TriView::Container::END));
+}
+
 }  // namespace ash