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

Unified Diff: net/spdy/core/spdy_framer_decoder_adapter.cc

Issue 2840563003: Implement SpdyMakeUnique and SpdyWrapUnique. (Closed)
Patch Set: Created 3 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/spdy/core/spdy_framer.cc ('k') | net/spdy/core/spdy_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/core/spdy_framer_decoder_adapter.cc
diff --git a/net/spdy/core/spdy_framer_decoder_adapter.cc b/net/spdy/core/spdy_framer_decoder_adapter.cc
index 3c4698bdf50e010f556399f53394cfda685a22d3..41d57e1f7674c7b0e0aa1b1b1585a96f53b8ebc5 100644
--- a/net/spdy/core/spdy_framer_decoder_adapter.cc
+++ b/net/spdy/core/spdy_framer_decoder_adapter.cc
@@ -10,6 +10,7 @@
#include "base/format_macros.h"
#include "base/logging.h"
#include "net/spdy/platform/api/spdy_estimate_memory_usage.h"
+#include "net/spdy/platform/api/spdy_ptr_util.h"
#include "net/spdy/platform/api/spdy_string_utils.h"
#if defined(COMPILER_GCC)
@@ -186,7 +187,8 @@ class NestedSpdyFramerDecoder : public SpdyFramerDecoderAdapter {
// SpdyFramer instance is passed to OnError. Passes the call on to the
// base adapter class and wrapped SpdyFramer.
void set_visitor(SpdyFramerVisitorInterface* visitor) override {
- visitor_adapter_.reset(new SpdyFramerVisitorAdapter(visitor, outer_));
+ visitor_adapter_ =
+ SpdyMakeUnique<SpdyFramerVisitorAdapter>(visitor, outer_);
SpdyFramerDecoderAdapter::set_visitor(visitor_adapter_.get());
framer_.set_visitor(visitor_adapter_.get());
}
@@ -244,8 +246,7 @@ class NestedSpdyFramerDecoder : public SpdyFramerDecoderAdapter {
std::unique_ptr<SpdyFramerDecoderAdapter> CreateNestedSpdyFramerDecoder(
SpdyFramer* outer) {
- return std::unique_ptr<SpdyFramerDecoderAdapter>(
- new NestedSpdyFramerDecoder(outer));
+ return SpdyMakeUnique<NestedSpdyFramerDecoder>(outer);
}
} // namespace net
« no previous file with comments | « net/spdy/core/spdy_framer.cc ('k') | net/spdy/core/spdy_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698