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

Side by Side Diff: net/quic/chromium/crypto/channel_id_chromium.cc

Issue 2503993002: Change unique_ptr::reset() for std::move (Closed)
Patch Set: Change unique_ptr::reset() for std::move Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/chromium/crypto/channel_id_chromium.h" 5 #include "net/quic/chromium/crypto/channel_id_chromium.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return QUIC_FAILURE; 121 return QUIC_FAILURE;
122 } 122 }
123 123
124 channel_id_key_.reset(); 124 channel_id_key_.reset();
125 125
126 hostname_ = hostname; 126 hostname_ = hostname;
127 127
128 next_state_ = STATE_GET_CHANNEL_ID_KEY; 128 next_state_ = STATE_GET_CHANNEL_ID_KEY;
129 switch (DoLoop(OK)) { 129 switch (DoLoop(OK)) {
130 case OK: 130 case OK:
131 channel_id_key->reset(channel_id_key_.release()); 131 *channel_id_key = std::move(channel_id_key_);
132 return QUIC_SUCCESS; 132 return QUIC_SUCCESS;
133 case ERR_IO_PENDING: 133 case ERR_IO_PENDING:
134 callback_.reset(callback); 134 callback_.reset(callback);
135 return QUIC_PENDING; 135 return QUIC_PENDING;
136 default: 136 default:
137 channel_id_key->reset(); 137 channel_id_key->reset();
138 return QUIC_FAILURE; 138 return QUIC_FAILURE;
139 } 139 }
140 } 140 }
141 141
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 active_jobs_[job_ptr] = std::move(job); 214 active_jobs_[job_ptr] = std::move(job);
215 } 215 }
216 return status; 216 return status;
217 } 217 }
218 218
219 void ChannelIDSourceChromium::OnJobComplete(Job* job) { 219 void ChannelIDSourceChromium::OnJobComplete(Job* job) {
220 active_jobs_.erase(job); 220 active_jobs_.erase(job);
221 } 221 }
222 222
223 } // namespace net 223 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/quic/core/crypto/quic_crypto_client_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698