Update from https://crrev.com/328418

services/view_manager/animation_runner.h

 // 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.
 
 #ifndef SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_
 #define SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_
 
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 68 matching lines @@
  private:
   enum CancelSource {
     // Cancel is the result of scheduling another animation for the view.
     CANCEL_SOURCE_SCHEDULE,
 
     // Cancel originates from an explicit call to cancel.
     CANCEL_SOURCE_CANCEL,
   };
 
   using ViewToAnimationMap =
-      base::ScopedPtrHashMap<ServerView*, ScheduledAnimationGroup>;
+      base::ScopedPtrHashMap<ServerView*, scoped_ptr<ScheduledAnimationGroup>>;
   using IdToViewsMap = std::map<AnimationId, std::set<ServerView*>>;
 
   void CancelAnimationForViewImpl(ServerView* view, CancelSource source);
 
   // Removes |view| from both |view_to_animation_map_| and |id_to_views_map_|.
   // Returns true if there are no more views animating with the animation id
   // the view is associated with.
   bool RemoveViewFromMaps(ServerView* view);
 
   AnimationId next_id_;
 
   base::TimeTicks last_tick_time_;
 
   ObserverList<AnimationRunnerObserver> observers_;
 
   ViewToAnimationMap view_to_animation_map_;
 
   IdToViewsMap id_to_views_map_;
 
   DISALLOW_COPY_AND_ASSIGN(AnimationRunner);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_ANIMATION_RUNNER_H_