Switch SupportsUserData uses to use unique_ptr.

net/websockets/websocket_stream.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_stream.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 75 matching lines @@
       const URLRequestContext* context,
       const url::Origin& origin,
       const GURL& first_party_for_cookies,
       const std::string& additional_headers,
       std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
       std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper)
       : delegate_(new Delegate(this)),
         url_request_(
             context->CreateRequest(url, DEFAULT_PRIORITY, delegate_.get())),
         connect_delegate_(std::move(connect_delegate)),
         handshake_stream_create_helper_(create_helper.release()),

[mattm, 2017/04/27 04:58:11]

would be cleaner to use create_helper.get() here and std::move(create_helper)
below

[Avi (use Gerrit), 2017/04/27 05:05:44]

Why is handshake_stream_create_helper_ even a member?

[mattm, 2017/04/27 05:15:27]

Good point. (I'm not familiar with the history of this code.)

         handshake_stream_(nullptr) {
     handshake_stream_create_helper_->set_stream_request(this);
     HttpRequestHeaders headers;
     headers.SetHeader(websockets::kUpgrade, websockets::kWebSocketLowercase);
     headers.SetHeader(HttpRequestHeaders::kConnection, websockets::kUpgrade);
     headers.SetHeader(HttpRequestHeaders::kOrigin, origin.Serialize());
     headers.SetHeader(websockets::kSecWebSocketVersion,
                       websockets::kSupportedVersion);
 
     headers.AddHeadersFromString(additional_headers);
 
     url_request_->SetExtraRequestHeaders(headers);
     url_request_->set_initiator(origin);
     url_request_->set_first_party_for_cookies(first_party_for_cookies);
 
     // This passes the ownership of |handshake_stream_create_helper_| to
     // |url_request_|.
     url_request_->SetUserData(
         WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
-        handshake_stream_create_helper_);
+        base::WrapUnique(handshake_stream_create_helper_));
     url_request_->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE);
     connect_delegate_->OnCreateRequest(url_request_.get());
   }
 
   // Destroying this object destroys the URLRequest, which cancels the request
   // and so terminates the handshake if it is incomplete.
   ~WebSocketStreamRequestImpl() override {}
 
   void OnHandshakeStreamCreated(
       WebSocketHandshakeStreamBase* handshake_stream) override {
@@ skipping 280 matching lines @@
   DCHECK(connect_delegate);
   if (headers.get()) {
     connect_delegate->OnFinishOpeningHandshake(
         base::MakeUnique<WebSocketHandshakeResponseInfo>(
             url, headers->response_code(), headers->GetStatusText(), headers,
             response_time));
   }
 }
 
 }  // namespace net