Cleanup/ linked_ptr -> scoped_ptr from c/b/ui/webui

chrome/browser/ui/webui/media_router/query_result_manager.h

 // Copyright 2015 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 CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_QUERY_RESULT_MANAGER_H_
 #define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_QUERY_RESULT_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/memory/linked_ptr.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/ui/webui/media_router/media_cast_mode.h"
 #include "chrome/browser/ui/webui/media_router/media_sink_with_cast_modes.h"
 
 namespace media_router {
 
@@ skipping 92 matching lines @@
   // |cast_mode|.
   void UpdateWithSinksQueryResult(MediaCastMode cast_mode,
                                   const std::vector<MediaSink>& result);
 
   // Notifies observers that results have been updated.
   void NotifyOnResultsUpdated();
 
   // MediaSinksObservers that listens for compatible MediaSink updates.
   // Each observer is associated with a MediaCastMode. Results received by
   // observers are propagated back to this class.
-  // TODO(mfoltz): Remove linked_ptr when there is a ScopedPtrMap available.
-  std::map<MediaCastMode, linked_ptr<MediaSinksObserver>> sinks_observers_;
+  std::map<MediaCastMode, scoped_ptr<MediaSinksObserver>> sinks_observers_;
 
   // Holds registrations of MediaSources for cast modes.
   std::map<MediaCastMode, MediaSource> cast_mode_sources_;
 
   // Holds all known sinks and their associated cast modes.
   std::map<MediaSink::Id, MediaSinkWithCastModes> all_sinks_;
 
   // Registered observers.
   base::ObserverList<Observer> observers_;
 
   // Not owned by this object.
   MediaRouter* router_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryResultManager);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_QUERY_RESULT_MANAGER_H_