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

Unified Diff: net/filter/gzip_filter.h

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: 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 | « net/filter/filter_unittest.cc ('k') | net/filter/gzip_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/filter/gzip_filter.h
diff --git a/net/filter/gzip_filter.h b/net/filter/gzip_filter.h
index 67330d7347344e00997563cc92c0343a8873cba5..c0d80b6859371fdca841def29bf4602de00f8138 100644
--- a/net/filter/gzip_filter.h
+++ b/net/filter/gzip_filter.h
@@ -15,8 +15,9 @@
#ifndef NET_FILTER_GZIP_FILTER_H_
#define NET_FILTER_GZIP_FILTER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "net/filter/filter.h"
typedef struct z_stream_s z_stream;
@@ -115,7 +116,7 @@ class GZipFilter : public Filter {
// Used to parse the gzip header in gzip stream.
// It is used when the decoding_mode_ is DECODE_MODE_GZIP.
- scoped_ptr<GZipHeader> gzip_header_;
+ std::unique_ptr<GZipHeader> gzip_header_;
// Tracks the progress of parsing gzip header.
// This variable is maintained by gzip_header_.
@@ -131,7 +132,7 @@ class GZipFilter : public Filter {
// The control block of zlib which actually does the decoding.
// This data structure is initialized by InitDecoding and updated only by
// DoInflate, with InsertZlibHeader being the exception as a workaround.
- scoped_ptr<z_stream> zlib_stream_;
+ std::unique_ptr<z_stream> zlib_stream_;
// For robustness, when we see the solo sdch filter, we chain in a gzip filter
// in front of it, with this flag to indicate that the gzip decoding might not
« no previous file with comments | « net/filter/filter_unittest.cc ('k') | net/filter/gzip_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698