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

Unified Diff: remoting/test/test_chromoting_client_unittest.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU 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 | « remoting/test/test_chromoting_client.cc ('k') | remoting/test/test_video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/test/test_chromoting_client_unittest.cc
diff --git a/remoting/test/test_chromoting_client_unittest.cc b/remoting/test/test_chromoting_client_unittest.cc
index e4bdcf3496e39f738bb204a9602f20d2af8ea01a..3cfc96172c77386192576b9bd6a7edc97eac5601 100644
--- a/remoting/test/test_chromoting_client_unittest.cc
+++ b/remoting/test/test_chromoting_client_unittest.cc
@@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "remoting/test/test_chromoting_client.h"
+
#include <string>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "remoting/protocol/fake_connection_to_host.h"
#include "remoting/signaling/fake_signal_strategy.h"
#include "remoting/test/connection_setup_info.h"
-#include "remoting/test/test_chromoting_client.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace remoting {
@@ -42,7 +44,7 @@ class TestChromotingClientTest : public ::testing::Test,
ConnectionSetupInfo connection_setup_info_;
FakeConnectionToHost* fake_connection_to_host_ = nullptr;
- scoped_ptr<TestChromotingClient> test_chromoting_client_;
+ std::unique_ptr<TestChromotingClient> test_chromoting_client_;
private:
// RemoteConnectionObserver interface.
@@ -66,10 +68,10 @@ void TestChromotingClientTest::SetUp() {
// keep the ptr around so we can use it to simulate state changes. It will
// remain valid until |test_chromoting_client_| is destroyed.
fake_connection_to_host_ = new FakeConnectionToHost();
- test_chromoting_client_->SetSignalStrategyForTests(make_scoped_ptr(
+ test_chromoting_client_->SetSignalStrategyForTests(base::WrapUnique(
new FakeSignalStrategy("test_user@faux_address.com/123")));
test_chromoting_client_->SetConnectionToHostForTests(
- make_scoped_ptr(fake_connection_to_host_));
+ base::WrapUnique(fake_connection_to_host_));
connection_setup_info_.host_jid = "test_host@faux_address.com/321";
}
« no previous file with comments | « remoting/test/test_chromoting_client.cc ('k') | remoting/test/test_video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698