Merge 199426 "Fixes a crash bug of calling animator without check."

ui/message_center/views/message_center_view.cc

 // Copyright (c) 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.
 
 #include "ui/message_center/views/message_center_view.h"
 
 #include <map>
 
 #include "base/stl_util.h"
 #include "grit/ui_strings.h"
@@ skipping 481 matching lines @@
 }
 
 void RichMessageListView::RemoveNotificationAt(int i) {
   views::View* child = child_at(GetActualIndex(i));
   if (GetContentsBounds().IsEmpty()) {
     delete child;
   } else {
     if (child->layer()) {
       deleting_views_.insert(child);
     } else {
-      animator_->StopAnimatingView(child);
+      if (animator_.get())
+        animator_->StopAnimatingView(child);
       delete child;
     }
     DoUpdateIfPossible();
   }
 }
 
 void RichMessageListView::UpdateNotificationAt(views::View* view, int i) {
   views::View* child = child_at(GetActualIndex(i));
   if (animator_.get())
     animator_->StopAnimatingView(child);
@@ skipping 358 matching lines @@
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->RemoveAllChildViews(true);
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center