| 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_;
|
|
|