[Extensions Bindings] Add more utility functions

extensions/renderer/api_request_handler_unittest.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 "base/bind.h"
 #include "base/guid.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "content/public/child/v8_value_converter.h"
 #include "extensions/renderer/api_binding_test_util.h"
 #include "extensions/renderer/api_request_handler.h"
 #include "gin/converter.h"
 #include "gin/public/context_holder.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/test/v8_test.h"
 #include "gin/try_catch.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace extensions {
 
 namespace {
 
 const char kEchoArgs[] =
     "(function() { this.result = Array.from(arguments); })";
 
-std::unique_ptr<base::Value> GetResultFromContext(
-    v8::Isolate* isolate,
-    v8::Local<v8::Context> context) {
-  v8::Context::Scope context_scope(context);
-  v8::Local<v8::Value> res;
-  EXPECT_TRUE(context->Global()
-                  ->Get(context, gin::StringToV8(isolate, "result"))
-                  .ToLocal(&res));
-  return V8ToBaseValue(res, context);
-}
-
 }  // namespace
 
 class APIRequestHandlerTest : public gin::V8Test {
  public:
   // Runs the given |function|.
   void RunJS(v8::Local<v8::Function> function,
              v8::Local<v8::Context> context,
              int argc,
              v8::Local<v8::Value> argv[]) {
-    EXPECT_FALSE(
-        function->Call(context, context->Global(), argc, argv).IsEmpty());
+    RunFunctionOnGlobal(function, context, argc, argv);
     did_run_js_ = true;
   }
 
  protected:
   APIRequestHandlerTest() {}
   ~APIRequestHandlerTest() override {}
 
   bool did_run_js() const { return did_run_js_; }
 
  private:
@@ skipping 24 matching lines @@
               testing::UnorderedElementsAre(request_id));
 
   const char kArguments[] = "['foo',1,{'prop1':'bar'}]";
   std::unique_ptr<base::ListValue> response_arguments =
       ListValueFromString(kArguments);
   ASSERT_TRUE(response_arguments);
   request_handler.CompleteRequest(request_id, *response_arguments);
 
   EXPECT_TRUE(did_run_js());
   std::unique_ptr<base::Value> result_value =
-      GetResultFromContext(isolate, context);
+      GetBaseValuePropertyFromObject(context->Global(), context, "result");
   ASSERT_TRUE(result_value);
   EXPECT_EQ(ReplaceSingleQuotes(kArguments), ValueToString(*result_value));
 
   EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
 }
 
 // Tests that trying to run non-existent or invalided requests is a no-op.
 TEST_F(APIRequestHandlerTest, InvalidRequestsTest) {
   v8::Isolate* isolate = instance_->isolate();
   v8::HandleScope handle_scope(instance_->isolate());
@@ skipping 55 matching lines @@
   std::unique_ptr<base::ListValue> response_a =
       ListValueFromString("['response_a:']");
   ASSERT_TRUE(response_a);
 
   request_handler.CompleteRequest(request_a, *response_a);
   EXPECT_TRUE(did_run_js());
   EXPECT_THAT(request_handler.GetPendingRequestIdsForTesting(),
               testing::UnorderedElementsAre(request_b));
 
   std::unique_ptr<base::Value> result_a =
-      GetResultFromContext(isolate, context_a);
+      GetBaseValuePropertyFromObject(context_a->Global(), context_a, "result");
   ASSERT_TRUE(result_a);
   EXPECT_EQ(ReplaceSingleQuotes("'response_a:alpha'"),
             ValueToString(*result_a));
 
   std::unique_ptr<base::ListValue> response_b =
       ListValueFromString("['response_b:']");
   ASSERT_TRUE(response_b);
 
   request_handler.CompleteRequest(request_b, *response_b);
   EXPECT_TRUE(request_handler.GetPendingRequestIdsForTesting().empty());
 
   std::unique_ptr<base::Value> result_b =
-      GetResultFromContext(isolate, context_b);
+      GetBaseValuePropertyFromObject(context_b->Global(), context_b, "result");
   ASSERT_TRUE(result_b);
   EXPECT_EQ(ReplaceSingleQuotes("'response_b:beta'"), ValueToString(*result_b));
 }
 
 }  // namespace extensions