Remove raw base::DictionaryValue::Set in //extensions

extensions/browser/api/web_request/web_request_event_details.cc

 // Copyright 2016 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 "extensions/browser/api/web_request/web_request_event_details.h"
 
+#include <utility>
+
 #include "base/callback.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/websocket_handshake_request_info.h"
 #include "content/public/common/child_process_host.h"
 #include "extensions/browser/api/web_request/upload_data_presenter.h"
 #include "extensions/browser/api/web_request/web_request_api_constants.h"
 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
 #include "extensions/browser/api/web_request/web_request_resource_type.h"
@@ skipping 101 matching lines @@
   request_headers_.reset(headers);
 }
 
 void WebRequestEventDetails::SetAuthInfo(
     const net::AuthChallengeInfo& auth_info) {
   dict_.SetBoolean(keys::kIsProxyKey, auth_info.is_proxy);
   if (!auth_info.scheme.empty())
     dict_.SetString(keys::kSchemeKey, auth_info.scheme);
   if (!auth_info.realm.empty())
     dict_.SetString(keys::kRealmKey, auth_info.realm);
-  base::DictionaryValue* challenger = new base::DictionaryValue();
+  auto challenger = base::MakeUnique<base::DictionaryValue>();
   challenger->SetString(keys::kHostKey, auth_info.challenger.host());
   challenger->SetInteger(keys::kPortKey, auth_info.challenger.port());
-  dict_.Set(keys::kChallengerKey, challenger);
+  dict_.Set(keys::kChallengerKey, std::move(challenger));
 }
 
 void WebRequestEventDetails::SetResponseHeaders(
     const net::URLRequest* request,
     const net::HttpResponseHeaders* response_headers) {
   if (!response_headers) {
     // Not all URLRequestJobs specify response headers. E.g. URLRequestFTPJob,
     // URLRequestFileJob and some redirects.
     dict_.SetInteger(keys::kStatusCodeKey, request->GetResponseCode());
     dict_.SetString(keys::kStatusLineKey, "");
@@ skipping 43 matching lines @@
   std::unique_ptr<WebRequestEventDetails> self(this);
   ExtensionApiFrameIdMap::Get()->GetFrameDataOnIO(
       render_process_id_, render_frame_id_,
       base::Bind(&WebRequestEventDetails::OnDeterminedFrameData,
                  base::Unretained(this), base::Passed(&self), callback));
 }
 
 std::unique_ptr<base::DictionaryValue> WebRequestEventDetails::GetFilteredDict(
     int extra_info_spec) const {
   std::unique_ptr<base::DictionaryValue> result = dict_.CreateDeepCopy();
   if ((extra_info_spec & ExtraInfoSpec::REQUEST_BODY) && request_body_)

[Devlin, 2017/06/02 15:38:48]

since the bodies of these if's are now multi-line, wrap in {}

[jdoerrie, 2017/06/06 12:40:23]

Done.

-    result->Set(keys::kRequestBodyKey, request_body_->CreateDeepCopy());
+    result->Set(keys::kRequestBodyKey,
+                base::MakeUnique<base::Value>(*request_body_));

[Devlin, 2017/06/02 15:38:48]

Is the copy-constructor preferred over CreateDeepCopy()?  CreateDeepCopy()
already returns a std::unique_ptr<>, and doesn't have any comments in values.h
indicating it's undesirable...

[vabr (Chromium), 2017/06/03 11:14:52]

Indeed, CreateDeepCopy is deprecated in favour of the copy constructor (see
https://codereview.chromium.org/2781983003/). The reason is that Value is being
migrated out of heap-pointers to plain values, and once there, CreateDeepCopy
will be identical with copy constructor and hence unneeded.

[Devlin, 2017/06/05 13:27:33]

SG.  Can we add a comment to DictionaryValue::CreateDeepCopy()?  (Okay to do in
a separate CL)

[jdoerrie, 2017/06/06 12:40:23]

Done: http://crrev.com/c/525792

   if ((extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS) && request_headers_)
-    result->Set(keys::kRequestHeadersKey, request_headers_->CreateDeepCopy());
+    result->Set(keys::kRequestHeadersKey,
+                base::MakeUnique<base::Value>(*request_headers_));
   if ((extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) && response_headers_)
-    result->Set(keys::kResponseHeadersKey, response_headers_->CreateDeepCopy());
+    result->Set(keys::kResponseHeadersKey,
+                base::MakeUnique<base::Value>(*response_headers_));
   return result;
 }
 
 std::unique_ptr<base::DictionaryValue>
 WebRequestEventDetails::GetAndClearDict() {
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   dict_.Swap(result.get());
   return result;
 }
 
@@ skipping 29 matching lines @@
 
 void WebRequestEventDetails::OnDeterminedFrameData(
     std::unique_ptr<WebRequestEventDetails> self,
     const DeterminedFrameDataCallback& callback,
     const ExtensionApiFrameIdMap::FrameData& frame_data) {
   SetFrameData(frame_data);
   callback.Run(std::move(self));
 }
 
 }  // namespace extensions