Remove WeakPtrFactory from LayerAnimationSequence

ui/compositor/layer_animation_sequence.cc

 // Copyright (c) 2012 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/compositor/layer_animation_sequence.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/animation/animation_id_provider.h"
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_observer.h"
 
 namespace ui {
 
 LayerAnimationSequence::LayerAnimationSequence()
     : properties_(LayerAnimationElement::UNKNOWN),
       is_cyclic_(false),
       last_element_(0),
       waiting_for_group_start_(false),
       animation_group_id_(0),
       last_progressed_fraction_(0.0),
-      animation_metrics_reporter_(nullptr),
-      weak_ptr_factory_(this) {}
+      animation_metrics_reporter_(nullptr) {}
 
 LayerAnimationSequence::LayerAnimationSequence(
     std::unique_ptr<LayerAnimationElement> element)
     : properties_(LayerAnimationElement::UNKNOWN),
       is_cyclic_(false),
       last_element_(0),
       waiting_for_group_start_(false),
       animation_group_id_(0),
       last_progressed_fraction_(0.0),
-      animation_metrics_reporter_(nullptr),
-      weak_ptr_factory_(this) {
+      animation_metrics_reporter_(nullptr) {
   AddElement(std::move(element));
 }
 
 LayerAnimationSequence::~LayerAnimationSequence() {
   for (auto& observer : observers_)
     observer.DetachedFromSequence(this, true);
 }
 
 void LayerAnimationSequence::Start(LayerAnimationDelegate* delegate) {
   DCHECK(start_time_ != base::TimeTicks());
@@ skipping 35 matching lines @@
     last_progressed_fraction_ =
         elements_[current_index]->last_progressed_fraction();
     current_index = last_element_ % elements_.size();
   }
 
   if (is_cyclic_ || last_element_ < elements_.size()) {
     if (!elements_[current_index]->Started()) {
       animation_group_id_ = cc::AnimationIdProvider::NextGroupId();
       elements_[current_index]->Start(delegate, animation_group_id_);
     }
-    base::WeakPtr<LayerAnimationSequence> alive(weak_ptr_factory_.GetWeakPtr());
+    base::WeakPtr<LayerAnimationSequence> alive(AsWeakPtr());
     if (elements_[current_index]->Progress(now, delegate))
       redraw_required = true;
     if (!alive)
       return;
     last_progressed_fraction_ =
         elements_[current_index]->last_progressed_fraction();
   }
 
   // Since the delegate may be deleted due to the notifications below, it is
   // important that we schedule a draw before sending them.
@@ skipping 182 matching lines @@
 
 LayerAnimationElement* LayerAnimationSequence::CurrentElement() const {
   if (elements_.empty())
     return NULL;
 
   size_t current_index = last_element_ % elements_.size();
   return elements_[current_index].get();
 }
 
 }  // namespace ui