Move close button to MessageView

ui/message_center/views/notification_view_unittest.cc

 // Copyright 2014 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 "ui/message_center/views/notification_view.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 161 matching lines @@
       gfx::Point current_point = (*current)->bounds().origin();
       views::View::ConvertPointToTarget(
           (*current), notification_view(), &current_point);
 
       EXPECT_LT(last_point.y(), current_point.y());
       last = current++;
     }
   }
 
   views::ImageButton* GetCloseButton() {
-    return notification_view()->close_button_.get();
+    return notification_view()->close_button();
   }
 
   void UpdateNotificationViews() {
-    notification_view()->CreateOrUpdateViews(*notification());
-    notification_view()->Layout();
+    notification_view()->UpdateWithNotification(*notification());
   }
 
   float GetNotificationScrollAmount() const {
     return notification_view()->GetTransform().To2dTranslation().x();
   }
 
   bool IsRemoved(const std::string& notification_id) const {
     return (removed_ids_.find(notification_id) != removed_ids_.end());
   }
 
@@ skipping 503 matching lines @@
 TEST_F(NotificationViewTest, Pinned) {
   notification()->set_pinned(true);
 
   UpdateNotificationViews();
   EXPECT_EQ(NULL, GetCloseButton());
 }
 
 #endif // defined(OS_CHROMEOS)
 
 }  // namespace message_center