[Content] Update V8ValueConverter::create to return a std::unique_ptr

extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

 // Copyright 2014 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/renderer/guest_view/guest_view_internal_custom_bindings.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 145 matching lines @@
 
   // TODO(fsamuel): Should we be reporting an error if the element instance ID
   // is invalid?
   if (!guest_view_container)
     return;
   // Retain a weak pointer so we can easily test if the container goes away.
   auto weak_ptr = guest_view_container->GetWeakPtr();
 
   int guest_instance_id = args[1]->Int32Value();
 
-  std::unique_ptr<base::DictionaryValue> params;
-  {
-    std::unique_ptr<V8ValueConverter> converter(V8ValueConverter::create());
-    std::unique_ptr<base::Value> params_as_value(
-        converter->FromV8Value(args[2], context()->v8_context()));
-    params = base::DictionaryValue::From(std::move(params_as_value));
-    CHECK(params);
-  }
+  std::unique_ptr<base::DictionaryValue> params = base::DictionaryValue::From(
+      content::V8ValueConverter::Create()->FromV8Value(
+          args[2], context()->v8_context()));
+  CHECK(params);
+
   // We should be careful that some malicious JS in the GuestView's embedder
   // hasn't destroyed |guest_view_container| during the enumeration of the
   // properties of the guest's object during extraction of |params| above
   // (see https://crbug.com/683523).
   if (!weak_ptr)
     return;
 
   // Add flag to |params| to indicate that the element size is specified in
   // logical units.
   params->SetBoolean(guest_view::kElementSizeIsLogical, true);
@@ skipping 58 matching lines @@
 
   int element_instance_id = args[0]->Int32Value();
   int guest_instance_id = args[1]->Int32Value();
 
   // Get the WebLocalFrame before (possibly) executing any user-space JS while
   // getting the |params|. We track the status of the RenderFrame via an
   // observer in case it is deleted during user code execution.
   content::RenderFrame* render_frame = GetRenderFrame(args[3]);
   RenderFrameStatus render_frame_status(render_frame);
 
-  std::unique_ptr<base::DictionaryValue> params;
-  {
-    std::unique_ptr<V8ValueConverter> converter(V8ValueConverter::create());
-    std::unique_ptr<base::Value> params_as_value(
-        converter->FromV8Value(args[2], context()->v8_context()));
-    params = base::DictionaryValue::From(std::move(params_as_value));
-    CHECK(params);
-  }
+  std::unique_ptr<base::DictionaryValue> params = base::DictionaryValue::From(
+      content::V8ValueConverter::Create()->FromV8Value(
+          args[2], context()->v8_context()));
+  CHECK(params);
+
   if (!render_frame_status.is_ok())
     return;
 
   blink::WebLocalFrame* frame = render_frame->GetWebFrame();
   // Parent must exist.
   blink::WebFrame* parent_frame = frame->Parent();
   DCHECK(parent_frame);
   DCHECK(parent_frame->IsWebLocalFrame());
 
   // Add flag to |params| to indicate that the element size is specified in
@@ skipping 181 matching lines @@
   // EnterFullscreen() and do it directly rather than having a generic "run with
   // user gesture" function.
   blink::WebScopedUserGesture user_gesture(context()->web_frame());
   CHECK_EQ(args.Length(), 1);
   CHECK(args[0]->IsFunction());
   context()->SafeCallFunction(
       v8::Local<v8::Function>::Cast(args[0]), 0, nullptr);
 }
 
 }  // namespace extensions