Implement the private API for quick unlock.

extensions/browser/api_test_utils.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/browser/api_test_utils.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using extensions::ExtensionFunctionDispatcher;
@@ skipping 101 matching lines @@
                          std::string());
 }
 
 scoped_refptr<Extension> CreateEmptyExtensionWithLocation(
     Manifest::Location location) {
   std::unique_ptr<base::DictionaryValue> test_extension_value =
       ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}");
   return CreateExtension(location, test_extension_value.get(), std::string());
 }
 
-base::Value* RunFunctionWithDelegateAndReturnSingleResult(
-    UIThreadExtensionFunction* function,
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
+    scoped_refptr<UIThreadExtensionFunction> function,
     const std::string& args,
     content::BrowserContext* context,
     std::unique_ptr<extensions::ExtensionFunctionDispatcher> dispatcher) {
   return RunFunctionWithDelegateAndReturnSingleResult(
       function, args, context, std::move(dispatcher), NONE);
 }
 
-base::Value* RunFunctionWithDelegateAndReturnSingleResult(
-    UIThreadExtensionFunction* function,
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
+    scoped_refptr<UIThreadExtensionFunction> function,
     const std::string& args,
     content::BrowserContext* context,
     std::unique_ptr<extensions::ExtensionFunctionDispatcher> dispatcher,
     RunFunctionFlags flags) {
-  scoped_refptr<ExtensionFunction> function_owner(function);
+  std::unique_ptr<base::ListValue> parsed_args = ParseList(args);
+  EXPECT_TRUE(parsed_args.get())
+      << "Could not parse extension function arguments: " << args;
+
+  return RunFunctionWithDelegateAndReturnSingleResult(
+      function, std::move(parsed_args), context, std::move(dispatcher), flags);
+}
+
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
+    scoped_refptr<UIThreadExtensionFunction> function,
+    std::unique_ptr<base::ListValue> args,
+    content::BrowserContext* context,
+    std::unique_ptr<extensions::ExtensionFunctionDispatcher> dispatcher,
+    RunFunctionFlags flags) {
   // Without a callback the function will not generate a result.
   function->set_has_callback(true);
-  RunFunction(function, args, context, std::move(dispatcher), flags);
-  EXPECT_TRUE(function->GetError().empty())
-      << "Unexpected error: " << function->GetError();
+  RunFunction(function.get(), std::move(args), context, std::move(dispatcher),
+              flags);
+  EXPECT_TRUE(function->GetError().empty()) << "Unexpected error: "
+                                            << function->GetError();
   const base::Value* single_result = NULL;
   if (function->GetResultList() != NULL &&
       function->GetResultList()->Get(0, &single_result)) {
-    return single_result->DeepCopy();
+    return base::WrapUnique(single_result->DeepCopy());

[Devlin, 2016/06/21 00:16:46]

nit: return single_result->CreateDeepCopy();

[jdufault, 2016/06/21 18:46:39]

Done.

   }
   return NULL;
 }
 
-base::Value* RunFunctionAndReturnSingleResult(
+std::unique_ptr<base::Value> RunFunctionAndReturnSingleResult(
     UIThreadExtensionFunction* function,
     const std::string& args,
     content::BrowserContext* context) {
   return RunFunctionAndReturnSingleResult(function, args, context, NONE);
 }
 
-base::Value* RunFunctionAndReturnSingleResult(
+std::unique_ptr<base::Value> RunFunctionAndReturnSingleResult(
     UIThreadExtensionFunction* function,
     const std::string& args,
     content::BrowserContext* context,
     RunFunctionFlags flags) {
   std::unique_ptr<ExtensionFunctionDispatcher> dispatcher(
       new ExtensionFunctionDispatcher(context));
 
   return RunFunctionWithDelegateAndReturnSingleResult(
       function, args, context, std::move(dispatcher), flags);
 }
@@ skipping 56 matching lines @@
   function->set_include_incognito(flags & INCLUDE_INCOGNITO);
   function->RunWithValidation()->Execute();
   response_delegate.WaitForResponse();
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 }  // namespace api_test_utils
 }  // namespace extensions