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"
@@ skipping 141 matching lines @@
   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 NULL;
 }
 
+base::Value* RunFunctionWithDelegateAndReturnSingleResult(

[Devlin, 2016/06/06 16:35:01]

If you want to add this, we should do a few things:
- Have the other version call into this after parsing the args.
- Change the return value to be a std::unique_ptr<> for this version.
- Accept a scoped_refptr<> for the function in this version.

[jdufault, 2016/06/08 18:39:10]

I've made the other version call into this one.

But why does this variant need to return a std::unique_ptr? Why does it need to
accept a scoped_refptr?

In particular, returning a std::unique_ptr will propagate to the other variants
calling into this function, as we either need to unwrap the unique_ptr or change
the interface. If the interface is updated, then the various call sites will
have to be updated. At that point, the change should be done in a separate CL.

[Devlin, 2016/06/08 23:26:41]

The old versions of this *should* return a std::unique_ptr and accept a
scoped_refptr to make everything clear.  However, they don't, and I don't want
you to have to update N callsites in this CL since it's wildly out of scope
here. :)  That said, we should stop the incorrect pattern (in which ownership is
unclear) from propagating, so if we're adding something new, it should be
correct.

[Devlin, 2016/06/13 14:50:23]

Looks like this still needs to be done?

[jdufault, 2016/06/20 22:18:25]

I've changed the APIs. This propagated to a number of other calls as well, but
the call sites didn't need to get changed.

+    UIThreadExtensionFunction* function,
+    std::unique_ptr<base::ListValue> args,
+    content::BrowserContext* context,
+    std::unique_ptr<extensions::ExtensionFunctionDispatcher> dispatcher,
+    RunFunctionFlags flags) {
+  scoped_refptr<ExtensionFunction> function_owner(function);
+  // Without a callback the function will not generate a result.
+  function->set_has_callback(true);
+  RunFunction(function, 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 NULL;
+}
+
 base::Value* RunFunctionAndReturnSingleResult(
     UIThreadExtensionFunction* function,
     const std::string& args,
     content::BrowserContext* context) {
   return RunFunctionAndReturnSingleResult(function, args, context, NONE);
 }
 
 base::Value* RunFunctionAndReturnSingleResult(
     UIThreadExtensionFunction* function,
     const std::string& args,
@@ skipping 64 matching lines @@
   function->set_include_incognito(flags & INCLUDE_INCOGNITO);
   function->Run()->Execute();
   response_delegate.WaitForResponse();
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 }  // namespace api_test_utils
 }  // namespace extensions