Fix a crash in dtor of CallbackAnimationObserver

ui/keyboard/keyboard_controller.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/keyboard/keyboard_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 97 matching lines @@
 }
 
 }  // namespace
 
 namespace keyboard {
 
 // Observer for both keyboard show and hide animations. It should be owned by
 // KeyboardController.
 class CallbackAnimationObserver : public ui::LayerAnimationObserver {
  public:
-  CallbackAnimationObserver(ui::LayerAnimator* animator,
+  CallbackAnimationObserver(scoped_refptr<ui::LayerAnimator> animator,

[sadrul, 2015/04/27 18:56:16]

const scoped_refptr<>&

[bshe, 2015/04/27 19:52:54]

Done.

                             base::Callback<void(void)> callback);
   ~CallbackAnimationObserver() override;
 
  private:
   // Overridden from ui::LayerAnimationObserver:
   void OnLayerAnimationEnded(ui::LayerAnimationSequence* seq) override;
   void OnLayerAnimationAborted(ui::LayerAnimationSequence* seq) override;
   void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {}
 
-  ui::LayerAnimator* animator_;
+  scoped_refptr<ui::LayerAnimator> animator_;
   base::Callback<void(void)> callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackAnimationObserver);
 };
 
 CallbackAnimationObserver::CallbackAnimationObserver(
-    ui::LayerAnimator* animator, base::Callback<void(void)> callback)
+    scoped_refptr<ui::LayerAnimator> animator,
+    base::Callback<void(void)> callback)
     : animator_(animator), callback_(callback) {
 }
 
 CallbackAnimationObserver::~CallbackAnimationObserver() {
   animator_->RemoveObserver(this);
 }
 
 void CallbackAnimationObserver::OnLayerAnimationEnded(
     ui::LayerAnimationSequence* seq) {
   if (animator_->is_animating())
@@ skipping 423 matching lines @@
   proxy_->HideKeyboardContainer(container_.get());
 }
 
 void KeyboardController::AddBoundsChangedObserver(aura::Window* window) {
   aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr;
   if (target_window)
     window_bounds_observer_->AddObservedWindow(target_window);
 }
 
 }  // namespace keyboard