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

Unified Diff: remoting/protocol/session_config_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/protocol/session_config.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/session_config_unittest.cc
diff --git a/remoting/protocol/session_config_unittest.cc b/remoting/protocol/session_config_unittest.cc
index 466815f8eb619d592bc6cbd3dc39f33aca49808f..0835482bf8f6ca46e4d8cae0572673e4f252df8b 100644
--- a/remoting/protocol/session_config_unittest.cc
+++ b/remoting/protocol/session_config_unittest.cc
@@ -9,11 +9,11 @@
namespace remoting {
namespace protocol {
-void TestGetFinalConfig(scoped_ptr<SessionConfig> config) {
- scoped_ptr<CandidateSessionConfig> candidate_config =
+void TestGetFinalConfig(std::unique_ptr<SessionConfig> config) {
+ std::unique_ptr<CandidateSessionConfig> candidate_config =
CandidateSessionConfig::CreateFrom(*config);
ASSERT_TRUE(candidate_config);
- scoped_ptr<SessionConfig> config2 =
+ std::unique_ptr<SessionConfig> config2 =
SessionConfig::GetFinalConfig(candidate_config.get());
ASSERT_TRUE(config2);
EXPECT_EQ(config->protocol(), config2->protocol());
@@ -27,18 +27,18 @@ void TestGetFinalConfig(scoped_ptr<SessionConfig> config) {
}
TEST(SessionConfig, SelectCommon) {
- scoped_ptr<CandidateSessionConfig> default_candidate_config =
+ std::unique_ptr<CandidateSessionConfig> default_candidate_config =
CandidateSessionConfig::CreateDefault();
- scoped_ptr<CandidateSessionConfig> candidate_config_with_webrtc =
+ std::unique_ptr<CandidateSessionConfig> candidate_config_with_webrtc =
CandidateSessionConfig::CreateEmpty();
candidate_config_with_webrtc->set_webrtc_supported(true);
- scoped_ptr<CandidateSessionConfig> hybrid_candidate_config =
+ std::unique_ptr<CandidateSessionConfig> hybrid_candidate_config =
CandidateSessionConfig::CreateDefault();
hybrid_candidate_config->set_webrtc_supported(true);
- scoped_ptr<SessionConfig> selected;
+ std::unique_ptr<SessionConfig> selected;
// ICE is selected by default.
selected = SessionConfig::SelectCommon(default_candidate_config.get(),
@@ -82,19 +82,20 @@ TEST(SessionConfig, GetFinalConfig) {
}
TEST(SessionConfig, IsSupported) {
- scoped_ptr<CandidateSessionConfig> default_candidate_config =
+ std::unique_ptr<CandidateSessionConfig> default_candidate_config =
CandidateSessionConfig::CreateDefault();
- scoped_ptr<CandidateSessionConfig> candidate_config_with_webrtc =
+ std::unique_ptr<CandidateSessionConfig> candidate_config_with_webrtc =
CandidateSessionConfig::CreateEmpty();
candidate_config_with_webrtc->set_webrtc_supported(true);
- scoped_ptr<CandidateSessionConfig> hybrid_candidate_config =
+ std::unique_ptr<CandidateSessionConfig> hybrid_candidate_config =
CandidateSessionConfig::CreateDefault();
hybrid_candidate_config->set_webrtc_supported(true);
- scoped_ptr<SessionConfig> ice_config = SessionConfig::ForTest();
- scoped_ptr<SessionConfig> webrtc_config = SessionConfig::ForTestWithWebrtc();
+ std::unique_ptr<SessionConfig> ice_config = SessionConfig::ForTest();
+ std::unique_ptr<SessionConfig> webrtc_config =
+ SessionConfig::ForTestWithWebrtc();
EXPECT_TRUE(default_candidate_config->IsSupported(*ice_config));
EXPECT_FALSE(default_candidate_config->IsSupported(*webrtc_config));
« no previous file with comments | « remoting/protocol/session_config.cc ('k') | remoting/protocol/session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698