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

Unified Diff: net/filter/sdch_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/mock_filter_context.h ('k') | net/filter/sdch_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/filter/sdch_filter.h
diff --git a/net/filter/sdch_filter.h b/net/filter/sdch_filter.h
index 83e29c525e0ab5955fe0557f448a9e4ca4d4248a..3ba06930ffd740341a48bddef60fb0fd760d02e4 100644
--- a/net/filter/sdch_filter.h
+++ b/net/filter/sdch_filter.h
@@ -16,10 +16,10 @@
#include <stddef.h>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/net_export.h"
#include "net/base/sdch_dictionary.h"
#include "net/base/sdch_manager.h"
@@ -82,7 +82,8 @@ class NET_EXPORT_PRIVATE SdchFilter : public Filter {
// The underlying decoder that processes data.
// This data structure is initialized by InitDecoding and updated in
// ReadFilteredData.
- scoped_ptr<open_vcdiff::VCDiffStreamingDecoder> vcdiff_streaming_decoder_;
+ std::unique_ptr<open_vcdiff::VCDiffStreamingDecoder>
+ vcdiff_streaming_decoder_;
// After the encoded response SDCH header is read, this variable contains
// the server hash with trailing null byte.
@@ -131,7 +132,7 @@ class NET_EXPORT_PRIVATE SdchFilter : public Filter {
// If the response was encoded with a dictionary different than those
// advertised (e.g. a cached response using an old dictionary), this
// variable preserves that dictionary from deletion during decoding.
- scoped_ptr<SdchManager::DictionarySet> unexpected_dictionary_handle_;
+ std::unique_ptr<SdchManager::DictionarySet> unexpected_dictionary_handle_;
DISALLOW_COPY_AND_ASSIGN(SdchFilter);
};
« no previous file with comments | « net/filter/mock_filter_context.h ('k') | net/filter/sdch_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698