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

Unified Diff: remoting/protocol/content_description.h

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/connection_unittest.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/content_description.h
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index 048fe88cbe90b90bced54156948e7cc3120627b4..84949c727f5ad08f1affb66236e571fdeeb09f54 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -5,10 +5,10 @@
#ifndef REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
#define REMOTING_PROTOCOL_CONTENT_DESCRIPTION_H_
+#include <memory>
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/session_config.h"
namespace buzz {
@@ -27,8 +27,8 @@ class ContentDescription {
public:
static const char kChromotingContentName[];
- ContentDescription(scoped_ptr<CandidateSessionConfig> config,
- scoped_ptr<buzz::XmlElement> authenticator_message);
+ ContentDescription(std::unique_ptr<CandidateSessionConfig> config,
+ std::unique_ptr<buzz::XmlElement> authenticator_message);
~ContentDescription();
const CandidateSessionConfig* config() const {
@@ -41,13 +41,13 @@ class ContentDescription {
buzz::XmlElement* ToXml() const;
- static scoped_ptr<ContentDescription> ParseXml(
+ static std::unique_ptr<ContentDescription> ParseXml(
const buzz::XmlElement* element,
bool webrtc_transport);
private:
- scoped_ptr<const CandidateSessionConfig> candidate_config_;
- scoped_ptr<const buzz::XmlElement> authenticator_message_;
+ std::unique_ptr<const CandidateSessionConfig> candidate_config_;
+ std::unique_ptr<const buzz::XmlElement> authenticator_message_;
static bool ParseChannelConfigs(const buzz::XmlElement* const element,
const char tag_name[],
« no previous file with comments | « remoting/protocol/connection_unittest.cc ('k') | remoting/protocol/content_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698