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

Unified Diff: net/spdy/spdy_write_queue.h

Issue 2386883002: Remove stl_util's deletion functions from net/spdy/. (Closed)
Patch Set: nits Created 4 years, 2 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/spdy_read_queue.cc ('k') | net/spdy/spdy_write_queue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_write_queue.h
diff --git a/net/spdy/spdy_write_queue.h b/net/spdy/spdy_write_queue.h
index ebc815797519c3b88d75a34ef3e17ffad909ab8a..8ffef3b3a952f4e8a5fa577447574c17b20830a6 100644
--- a/net/spdy/spdy_write_queue.h
+++ b/net/spdy/spdy_write_queue.h
@@ -64,19 +64,20 @@ class NET_EXPORT_PRIVATE SpdyWriteQueue {
// A struct holding a frame producer and its associated stream.
struct PendingWrite {
SpdyFrameType frame_type;
- // This has to be a raw pointer since we store this in an STL
- // container.
- SpdyBufferProducer* frame_producer;
+ std::unique_ptr<SpdyBufferProducer> frame_producer;
base::WeakPtr<SpdyStream> stream;
// Whether |stream| was non-NULL when enqueued.
bool has_stream;
PendingWrite();
PendingWrite(SpdyFrameType frame_type,
- SpdyBufferProducer* frame_producer,
+ std::unique_ptr<SpdyBufferProducer> frame_producer,
const base::WeakPtr<SpdyStream>& stream);
- PendingWrite(const PendingWrite& other);
~PendingWrite();
+ PendingWrite(PendingWrite&& other);
+ PendingWrite& operator=(PendingWrite&& other);
+
+ DISALLOW_COPY_AND_ASSIGN(PendingWrite);
};
bool removing_writes_;
« no previous file with comments | « net/spdy/spdy_read_queue.cc ('k') | net/spdy/spdy_write_queue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698