Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2862)

Unified Diff: chrome/browser/ui/webui/media_router/query_result_manager.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/media_router/query_result_manager.h
diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.h b/chrome/browser/ui/webui/media_router/query_result_manager.h
index 8061d6c5bb2a48c7b55bd01248581991214ffafc..b56211b61fe589df3fdd57d55bc44a6f0d26ea4f 100644
--- a/chrome/browser/ui/webui/media_router/query_result_manager.h
+++ b/chrome/browser/ui/webui/media_router/query_result_manager.h
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_UI_WEBUI_MEDIA_ROUTER_QUERY_RESULT_MANAGER_H_
#include <map>
+#include <memory>
#include <set>
#include <vector>
#include "base/gtest_prod_util.h"
#include "base/macros.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"
@@ -128,7 +128,7 @@ class QueryResultManager {
// MediaSinksObservers that listens for compatible MediaSink updates.
// Each observer is associated with a MediaCastMode. Results received by
// observers are propagated back to this class.
- std::map<MediaCastMode, scoped_ptr<MediaSinksObserver>> sinks_observers_;
+ std::map<MediaCastMode, std::unique_ptr<MediaSinksObserver>> sinks_observers_;
// Holds registrations of MediaSources for cast modes.
std::map<MediaCastMode, MediaSource> cast_mode_sources_;

Powered by Google App Engine
This is Rietveld 408576698