Switch to using scoped_ptr with UserData

content/browser/service_worker/foreign_fetch_request_handler.cc

 // Copyright 2015 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 "content/browser/service_worker/foreign_fetch_request_handler.h"
 
 #include <string>
+#include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_response_info.h"
 #include "content/browser/service_worker/service_worker_url_request_job.h"
 #include "content/common/resource_request_body_impl.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/service_worker/service_worker_utils.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_client.h"
@@ skipping 96 matching lines @@
         provider_host->running_hosted_version()->remaining_timeout());
   }
 
   if (!context_wrapper->OriginHasForeignFetchRegistrations(
           request->url().GetOrigin())) {
     return;
   }
 
   // Any more precise checks to see if the request should be intercepted are
   // asynchronous, so just create our handler in all cases.
-  std::unique_ptr<ForeignFetchRequestHandler> handler(
-      new ForeignFetchRequestHandler(
+  std::unique_ptr<ForeignFetchRequestHandler> handler =
+      base::WrapUnique(new ForeignFetchRequestHandler(
           context_wrapper, blob_storage_context->AsWeakPtr(), request_mode,
           credentials_mode, redirect_mode, resource_type, request_context_type,
           frame_type, body, timeout));
-  request->SetUserData(&kUserDataKey, handler.release());
+  request->SetUserData(&kUserDataKey, std::move(handler));
 }
 
 ForeignFetchRequestHandler* ForeignFetchRequestHandler::GetHandler(
     net::URLRequest* request) {
   return static_cast<ForeignFetchRequestHandler*>(
       request->GetUserData(&kUserDataKey));
 }
 
 std::unique_ptr<net::URLRequestInterceptor>
 ForeignFetchRequestHandler::CreateInterceptor(
@@ skipping 160 matching lines @@
   // The worker entry in the database was written by old version Chrome (< M56)
   // and the main script was not loaded yet. In this case, we can't check the
   // origin trial token.
   if (!active_version->origin_trial_tokens())
     return true;
   const auto& token_map = *active_version->origin_trial_tokens();
   return base::ContainsKey(token_map, "ForeignFetch");
 }
 
 }  // namespace content