Remove reference to flags from MessageListView.

This CL removes reference to runtime flags from MessageListView,
and moved the option to the constructor.
Direct reference to flag led to unit test failure in
MessageCenterViewTest.SizeAfterUpdateOfRepositionTarget.

TEST=out/Release/ash_unittests '--gtest_filter=*MessageCenter*' \
--enable-features=SystemTrayUnified
BUG=847104

Change-Id: I82d33c827d79bf5fc53d30453e8ac91b18396356
Reviewed-on: https://chromium-review.googlesource.com/1088329Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564948}

ash/message_center/message_center_view.cc

@@ -216,6 +216,7 @@ MessageCenterView::MessageCenterView(
   scroller_->SetHorizontalScrollBar(new views::OverlayScrollBar(true));
 
   message_list_view_.reset(new MessageListView());
+  message_list_view_->SetBorderPadding();
   message_list_view_->set_scroller(scroller_);
   message_list_view_->set_owned_by_client();
   message_list_view_->AddObserver(this);

ash/message_center/message_list_view.cc

@@ -6,8 +6,6 @@
 
 #include "ash/message_center/message_center_style.h"
 #include "ash/message_center/message_center_view.h"
-#include "ash/public/cpp/ash_features.h"
-#include "ash/public/cpp/ash_switches.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ -30,16 +28,6 @@ namespace ash {
 
 namespace {
 const int kAnimateClearingNextNotificationDelayMS = 40;
-
-bool HasBorderPadding() {
-  return !switches::IsSidebarEnabled() &&
-         !features::IsSystemTrayUnifiedEnabled();
-}
-
-int GetMarginBetweenItems() {
-  return HasBorderPadding() ? message_center::kMarginBetweenItemsInList : 0;
-}
-
 }  // namespace
 
 MessageListView::MessageListView()
@@ -48,6 +36,7 @@ MessageListView::MessageListView()
       has_deferred_task_(false),
       clear_all_started_(false),
       use_fixed_height_(true),
+      has_border_padding_(false),
       animator_(this),
       weak_ptr_factory_(this) {
   auto layout = std::make_unique<views::BoxLayout>(views::BoxLayout::kVertical,
@@ -55,10 +44,6 @@ MessageListView::MessageListView()
   layout->SetDefaultFlex(1);
   SetLayoutManager(std::move(layout));
 
-  if (HasBorderPadding()) {
-    SetBorder(views::CreateEmptyBorder(
-        gfx::Insets(message_center::kMarginBetweenItemsInList)));
-  }
   animator_.AddObserver(this);
 }
 
@@ -337,6 +322,12 @@ void MessageListView::RemoveObserver(MessageListView::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
+void MessageListView::SetBorderPadding() {
+  has_border_padding_ = true;
+  SetBorder(views::CreateEmptyBorder(
+      gfx::Insets(message_center::kMarginBetweenItemsInList)));
+}
+
 void MessageListView::OnBoundsAnimatorProgressed(
     views::BoundsAnimator* animator) {
   DCHECK_EQ(&animator_, animator);
@@ -392,6 +383,10 @@ void MessageListView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
     GetWidget()->SynthesizeMouseMoveEvent();
 }
 
+int MessageListView::GetMarginBetweenItems() const {
+  return has_border_padding_ ? message_center::kMarginBetweenItemsInList : 0;
+}
+
 bool MessageListView::IsValidChild(const views::View* child) const {
   return child->visible() &&
          deleting_views_.find(const_cast<views::View*>(child)) ==

ash/message_center/message_list_view.h

@@ -68,6 +68,8 @@ class ASH_EXPORT MessageListView : public views::View,
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
+  void SetBorderPadding();
+
   void set_use_fixed_height(bool use_fixed_height) {
     use_fixed_height_ = use_fixed_height;
   }
@@ -89,6 +91,7 @@ class ASH_EXPORT MessageListView : public views::View,
   friend class MessageCenterViewTest;
   friend class MessageListViewTest;
 
+  int GetMarginBetweenItems() const;
   bool IsValidChild(const views::View* child) const;
   void DoUpdateIfPossible();
 
@@ -132,6 +135,7 @@ class ASH_EXPORT MessageListView : public views::View,
   bool has_deferred_task_;
   bool clear_all_started_;
   bool use_fixed_height_;
+  bool has_border_padding_;
   std::set<views::View*> adding_views_;
   std::set<views::View*> deleting_views_;
   std::set<views::View*> deleted_when_done_;

ash/message_center/message_list_view_unittest.cc

@@ -102,6 +102,7 @@ class MessageListViewTest : public AshTestBase,
     AshTestBase::SetUp();
 
     message_list_view_.reset(new MessageListView());
+    message_list_view_->SetBorderPadding();
     message_list_view_->AddObserver(this);
     message_list_view_->set_owned_by_client();