Replacing raw pointer to LayerAnimator with scoped_refptr in ScopedLayerAnimationSettings.

content/browser/web_contents/aura/overscroll_navigation_overlay.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 "content/browser/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 59 matching lines @@
   // Takes ownership of the layer.
   explicit OverlayDismissAnimator(scoped_ptr<ui::Layer> layer)
       : layer_(layer.Pass()) {
     CHECK(layer_.get());
   }
 
   // Starts the fadeout animation on the layer. When the animation finishes,
   // the object deletes itself along with the layer.
   void Animate() {
     DCHECK(layer_.get());
-    // Hold on to LayerAnimator to ensure it is not deleted before animation
-    // settings. Without this LayerAnimator would be deleted from SetOpacity if
-    // the animation duration is 0.
-    scoped_refptr<ui::LayerAnimator> animator(layer_->GetAnimator());
-    {
-      // This makes SetOpacity() animate with default duration (which could be
-      // zero, e.g. when running tests).
-      ui::ScopedLayerAnimationSettings settings(animator);
-      animator->AddObserver(this);
-      layer_->SetOpacity(0);
-    }
+    ui::LayerAnimator* animator = layer_->GetAnimator();
+    // This makes SetOpacity() animate with default duration (which could be
+    // zero, e.g. when running tests).
+    ui::ScopedLayerAnimationSettings settings(animator);
+    animator->AddObserver(this);
+    layer_->SetOpacity(0);
   }
 
   // Overridden from ui::LayerAnimationObserver
   virtual void OnLayerAnimationEnded(
       ui::LayerAnimationSequence* sequence) OVERRIDE {
     delete this;
   }
 
   virtual void OnLayerAnimationAborted(
       ui::LayerAnimationSequence* sequence) OVERRIDE {
@@ skipping 197 matching lines @@
 bool OverscrollNavigationOverlay::OnMessageReceived(
     const IPC::Message& message) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   IPC_BEGIN_MESSAGE_MAP(OverscrollNavigationOverlay, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect)
   IPC_END_MESSAGE_MAP()
   return false;
 }
 
 }  // namespace content