[Extensions Bindings] Add a GetStringPropertyFromObject test method

extensions/renderer/api_bindings_system_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 "extensions/renderer/api_bindings_system.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
@@ skipping 214 matching lines @@
     CallFunctionOnObject(context, alpha_api, kTestCall);
 
     ValidateLastRequest("alpha.functionWithCallback", "['foo']");
 
     const char kResponseArgsJson[] = "['response',1,{'key':42}]";
     std::unique_ptr<base::ListValue> expected_args =
         ListValueFromString(kResponseArgsJson);
     bindings_system()->CompleteRequest(last_request()->request_id,
                                        *expected_args);
 
-    std::unique_ptr<base::Value> result = GetBaseValuePropertyFromObject(
-        context->Global(), context, "callbackArguments");
-    ASSERT_TRUE(result);
-    EXPECT_EQ(ReplaceSingleQuotes(kResponseArgsJson), ValueToString(*result));
+    EXPECT_EQ(ReplaceSingleQuotes(kResponseArgsJson),
+              GetStringPropertyFromObject(context->Global(), context,
+                                          "callbackArguments"));
     reset_last_request();
   }
 
   {
     // Test a call with references -> response.
     const char kTestCall[] =
         "obj.functionWithRefAndCallback({prop1: 'alpha', prop2: 42},\n"
         "                               function() {\n"
         "  this.callbackArguments = Array.from(arguments);\n"
         "});";
 
     CallFunctionOnObject(context, alpha_api, kTestCall);
 
     ValidateLastRequest("alpha.functionWithRefAndCallback",
                         "[{'prop1':'alpha','prop2':42}]");
 
     bindings_system()->CompleteRequest(last_request()->request_id,
                                        base::ListValue());
 
-    std::unique_ptr<base::Value> result = GetBaseValuePropertyFromObject(
-        context->Global(), context, "callbackArguments");
-    ASSERT_TRUE(result);
-    EXPECT_EQ("[]", ValueToString(*result));
+    EXPECT_EQ("[]", GetStringPropertyFromObject(context->Global(), context,
+                                                "callbackArguments"));
     reset_last_request();
   }
 
   {
     // Test an event registration -> event occurrence.
     const char kTestCall[] =
         "obj.alphaEvent.addListener(function() {\n"
         "  this.eventArguments = Array.from(arguments);\n"
         "});\n";
     CallFunctionOnObject(context, alpha_api, kTestCall);
 
     const char kResponseArgsJson[] = "['response',1,{'key':42}]";
     std::unique_ptr<base::ListValue> expected_args =
         ListValueFromString(kResponseArgsJson);
     bindings_system()->FireEventInContext("alpha.alphaEvent", context,
                                           *expected_args);
 
-    std::unique_ptr<base::Value> result = GetBaseValuePropertyFromObject(
-        context->Global(), context, "eventArguments");
-    ASSERT_TRUE(result);
-    EXPECT_EQ(ReplaceSingleQuotes(kResponseArgsJson), ValueToString(*result));
+    EXPECT_EQ(ReplaceSingleQuotes(kResponseArgsJson),
+              GetStringPropertyFromObject(context->Global(), context,
+                                          "eventArguments"));
   }
 
   {
     // Test a call -> response on the second API.
     const char kTestCall[] = "obj.simpleFunc(2)";
     CallFunctionOnObject(context, beta_api, kTestCall);
     ValidateLastRequest("beta.simpleFunc", "[2]");
     EXPECT_EQ(-1, last_request()->request_id);
     reset_last_request();
   }
@@ skipping 39 matching lines @@
 
   {
     // Test a simple call -> response.
     const char kTestCall[] =
         "obj.functionWithCallback('foo', function() {\n"
         "  this.callbackArguments = Array.from(arguments);\n"
         "});";
     CallFunctionOnObject(context, alpha_api, kTestCall);
     EXPECT_TRUE(did_call);
 
-    std::unique_ptr<base::Value> result = GetBaseValuePropertyFromObject(
-        context->Global(), context, "callbackArguments");
-    ASSERT_TRUE(result);
-    EXPECT_EQ("[\"bar\"]", ValueToString(*result));
+    EXPECT_EQ("[\"bar\"]",
+              GetStringPropertyFromObject(context->Global(), context,
+                                          "callbackArguments"));
   }
 }
 
 // An implementation using real API schemas.
 class APIBindingsSystemTestWithRealAPI : public APIBindingsSystemTestBase {
  protected:
   APIBindingsSystemTestWithRealAPI() {}
 
   // Executes the given |script_source| in |context|, expecting no exceptions.
   void ExecuteScript(v8::Local<v8::Context> context,
@@ skipping 122 matching lines @@
     EXPECT_FALSE(last_request());
     reset_last_request();  // Just to not pollute future results.
   }
 
   {
     const char kTestCall[] =
         "chrome.idle.onStateChanged.addListener(state => {\n"
         "  this.idleState = state;\n"
         "});\n";
     ExecuteScript(context, kTestCall);
-    v8::Local<v8::Value> v8_result =
-        GetPropertyFromObject(context->Global(), context, "idleState");
-    EXPECT_TRUE(v8_result->IsUndefined());
+    EXPECT_EQ("undefined", GetStringPropertyFromObject(context->Global(),
+                                                       context, "idleState"));
     bindings_system()->FireEventInContext("idle.onStateChanged", context,
                                           *ListValueFromString("['active']"));
 
-    std::unique_ptr<base::Value> result =
-        GetBaseValuePropertyFromObject(context->Global(), context, "idleState");
-    ASSERT_TRUE(result);
-    EXPECT_EQ("\"active\"", ValueToString(*result));
+    EXPECT_EQ("\"active\"", GetStringPropertyFromObject(context->Global(),
+                                                        context, "idleState"));
   }
 }
 
 }  // namespace extensions