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

Side by Side Diff: remoting/protocol/content_description_unittest.cc

Issue 1534193004: Use std::move() instead of scoped_ptr<>::Pass(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/content_description.h" 5 #include "remoting/protocol/content_description.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "remoting/protocol/authenticator.h" 10 #include "remoting/protocol/authenticator.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" 13 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 namespace protocol { 16 namespace protocol {
17 17
18 TEST(ContentDescriptionTest, FormatAndParse) { 18 TEST(ContentDescriptionTest, FormatAndParse) {
19 scoped_ptr<CandidateSessionConfig> config = 19 scoped_ptr<CandidateSessionConfig> config =
20 CandidateSessionConfig::CreateDefault(); 20 CandidateSessionConfig::CreateDefault();
21 ContentDescription description( 21 ContentDescription description(
22 config.Pass(), Authenticator::CreateEmptyAuthenticatorMessage()); 22 std::move(config), Authenticator::CreateEmptyAuthenticatorMessage());
23 scoped_ptr<buzz::XmlElement> xml(description.ToXml()); 23 scoped_ptr<buzz::XmlElement> xml(description.ToXml());
24 LOG(ERROR) << xml->Str(); 24 LOG(ERROR) << xml->Str();
25 scoped_ptr<ContentDescription> parsed( 25 scoped_ptr<ContentDescription> parsed(
26 ContentDescription::ParseXml(xml.get(), false)); 26 ContentDescription::ParseXml(xml.get(), false));
27 ASSERT_TRUE(parsed.get()); 27 ASSERT_TRUE(parsed.get());
28 EXPECT_TRUE(description.config()->control_configs() == 28 EXPECT_TRUE(description.config()->control_configs() ==
29 parsed->config()->control_configs()); 29 parsed->config()->control_configs());
30 EXPECT_TRUE(description.config()->video_configs() == 30 EXPECT_TRUE(description.config()->video_configs() ==
31 parsed->config()->video_configs()); 31 parsed->config()->video_configs());
32 EXPECT_TRUE(description.config()->event_configs() == 32 EXPECT_TRUE(description.config()->event_configs() ==
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 scoped_ptr<ContentDescription> parsed( 96 scoped_ptr<ContentDescription> parsed(
97 ContentDescription::ParseXml(xml.get(), false)); 97 ContentDescription::ParseXml(xml.get(), false));
98 ASSERT_TRUE(parsed.get()); 98 ASSERT_TRUE(parsed.get());
99 EXPECT_EQ(1U, parsed->config()->audio_configs().size()); 99 EXPECT_EQ(1U, parsed->config()->audio_configs().size());
100 EXPECT_TRUE(parsed->config()->audio_configs().front() == ChannelConfig()); 100 EXPECT_TRUE(parsed->config()->audio_configs().front() == ChannelConfig());
101 } 101 }
102 102
103 } // namespace protocol 103 } // namespace protocol
104 } // namespace remoting 104 } // namespace remoting
105 105
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698