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

Unified Diff: content/renderer/p2p/filtering_network_manager_unittest.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/renderer/notification_permission_dispatcher.cc ('k') | content/renderer/p2p/ipc_network_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/filtering_network_manager_unittest.cc
diff --git a/content/renderer/p2p/filtering_network_manager_unittest.cc b/content/renderer/p2p/filtering_network_manager_unittest.cc
index d708428c042702d2727e6e09d38e1c29b07602ae..84185baf658db2b02fe2c9349eea58acafdd5ebd 100644
--- a/content/renderer/p2p/filtering_network_manager_unittest.cc
+++ b/content/renderer/p2p/filtering_network_manager_unittest.cc
@@ -5,12 +5,13 @@
#include "content/renderer/p2p/filtering_network_manager.h"
#include <stddef.h>
+
+#include <memory>
#include <utility>
#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/test/test_simple_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "content/renderer/p2p/empty_network_manager.h"
@@ -71,7 +72,7 @@ class MockNetworkManager : public rtc::NetworkManager {
private:
bool sent_first_update_ = false;
- scoped_ptr<rtc::Network> network_;
+ std::unique_ptr<rtc::Network> network_;
};
class MockMediaPermission : public media::MediaPermission {
@@ -201,10 +202,10 @@ class FilteringNetworkManagerTest : public testing::Test,
void clear_callback_called() { callback_called_ = false; }
bool callback_called_ = false;
- scoped_ptr<rtc::NetworkManager> network_manager_;
- scoped_ptr<MockNetworkManager> mock_network_manager_;
+ std::unique_ptr<rtc::NetworkManager> network_manager_;
+ std::unique_ptr<MockNetworkManager> mock_network_manager_;
- scoped_ptr<MockMediaPermission> media_permission_;
+ std::unique_ptr<MockMediaPermission> media_permission_;
NetworkList network_list_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
« no previous file with comments | « content/renderer/notification_permission_dispatcher.cc ('k') | content/renderer/p2p/ipc_network_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698