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

Unified Diff: webrtc/base/proxydetect.cc

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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 | « webrtc/base/proxy_unittest.cc ('k') | webrtc/base/proxyserver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/proxydetect.cc
diff --git a/webrtc/base/proxydetect.cc b/webrtc/base/proxydetect.cc
index abb8f0a927904a7f09cbe408e0024137859f2754..10e7a02241c3af442065ecc85a50316aebf66575 100644
--- a/webrtc/base/proxydetect.cc
+++ b/webrtc/base/proxydetect.cc
@@ -29,6 +29,7 @@
#endif
#include <map>
+#include <memory>
#include "webrtc/base/arraysize.h"
#include "webrtc/base/fileutils.h"
@@ -430,7 +431,7 @@ bool GetDefaultFirefoxProfile(Pathname* profile_path) {
// Note: we are looking for the first entry with "Default=1", or the last
// entry in the file
path.SetFilename("profiles.ini");
- scoped_ptr<FileStream> fs(Filesystem::OpenFile(path, "r"));
+ std::unique_ptr<FileStream> fs(Filesystem::OpenFile(path, "r"));
if (!fs) {
return false;
}
@@ -495,7 +496,7 @@ bool GetDefaultFirefoxProfile(Pathname* profile_path) {
bool ReadFirefoxPrefs(const Pathname& filename,
const char * prefix,
StringMap* settings) {
- scoped_ptr<FileStream> fs(Filesystem::OpenFile(filename, "r"));
+ std::unique_ptr<FileStream> fs(Filesystem::OpenFile(filename, "r"));
if (!fs) {
LOG(LS_ERROR) << "Failed to open file: " << filename.pathname();
return false;
« no previous file with comments | « webrtc/base/proxy_unittest.cc ('k') | webrtc/base/proxyserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698