Rework ExtensionApiUnittest to run in extensions_unittests, removing its Chrome dependencies.

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 "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 114 matching lines @@
     content::BrowserContext* context,
     RunFunctionFlags flags) {
   TestFunctionDispatcherDelegate delegate;
   scoped_ptr<ExtensionFunctionDispatcher> dispatcher(
       new ExtensionFunctionDispatcher(context, &delegate));
 
   return RunFunctionWithDelegateAndReturnSingleResult(
       function, args, context, dispatcher.Pass(), flags);
 }
 
+std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,

[James Cook, 2014/08/13 16:11:36]

What's the plan for the copy of this code in
chrome/browser/extensions/extension_function_test_utils.cc?  Can that copy be
refactored to call this copy?

If not, can you leave a comment there pointing out that there is similar code
here?  Can the copy in Chrome be marked deprecated and new test authors
encouraged to use this one?

[Yoyo Zhou, 2014/08/13 22:53:43]

I'd rather not spend time on refactoring it when the goal is to eliminate it;
I'll add a deprecation comment.

+                                      const std::string& args,
+                                      content::BrowserContext* context) {
+  return RunFunctionAndReturnError(function, args, context, NONE);
+}
+
+std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
+                                      const std::string& args,
+                                      content::BrowserContext* context,
+                                      RunFunctionFlags flags) {
+  TestFunctionDispatcherDelegate delegate;
+  scoped_ptr<ExtensionFunctionDispatcher> dispatcher(
+      new ExtensionFunctionDispatcher(context, &delegate));
+  scoped_refptr<ExtensionFunction> function_owner(function);
+  // Without a callback the function will not generate a result.
+  function->set_has_callback(true);
+  RunFunction(function, args, context, dispatcher.Pass(), flags);
+  EXPECT_FALSE(function->GetResultList()) << "Did not expect a result";
+  return function->GetError();
+}
+
 bool RunFunction(UIThreadExtensionFunction* function,
                  const std::string& args,
                  content::BrowserContext* context,
                  scoped_ptr<extensions::ExtensionFunctionDispatcher> dispatcher,
                  RunFunctionFlags flags) {
   SendResponseDelegate response_delegate;
   function->set_test_delegate(&response_delegate);
   scoped_ptr<base::ListValue> parsed_args(ParseList(args));
   EXPECT_TRUE(parsed_args.get())
       << "Could not parse extension function arguments: " << args;
@@ skipping 12 matching lines @@
     response_delegate.set_should_post_quit(true);
     content::RunMessageLoop();
   }
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 }  // namespace api_test_utils
 }  // namespace extensions