[proxy] fixing harmony/proxy.js tests and improving error messages + some drive-by fixes

src/messages.h

Index: src/messages.h
diff --git a/src/messages.h b/src/messages.h
index b6e22bc096b75a5e91bc51a3f4423828f2ea7a90..88a6ddc324c06c2ce36138bc2b47dd626067017a 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -189,7 +189,6 @@ class CallSite {
     "Trap 'deleteProperty' returned true but property '%' is not configurable" \
     " in the proxy target")                                                    \
   T(ProxyHandlerNonObject, "Cannot create proxy with non-object as handler")   \
-  T(ProxyHandlerReturned, "Proxy handler % returned % from '%' trap")          \
   T(ProxyHandlerTrapMissing, "Proxy handler % has no '%' trap")                \
   T(ProxyHandlerTrapMustBeCallable,                                            \
     "Proxy handler % has non-callable '%' trap")                               \
@@ -214,7 +213,16 @@ class CallSite {
     "Construct trap must return Object, but got ''%s'.")                       \
   T(ProxyTrapFunctionExpected,                                                 \
     "Proxy.createFunction called with non-function for '%' trap")              \
-  T(ProxyTrapResultMustInclude, "Trap result must include %.")                 \
+  T(ProxyTrapOwnKeysResultMustInclude,                                         \
+    "Result of trap 'ownKeys' must include '%'.")                              \
+  T(ProxyTrapReturned, "Proxy handler % returned % from '%' trap")             \
+  T(ProxyTrapReturnedNonBoolean,                                               \
+    "Proxy handler % returned % from '%' trap instead of a Boolean")           \
+  T(ProxyTrapReturnedNonObject,                                                \
+    "Proxy handler % returned % from '%' trap instead of an Object")           \
+  T(ProxyTrapDescriptorNonConfigurable,                                        \
+    "Proxy %s trap returned non-configurable PropertyDescriptor for property " \
+    "'%' even though the property on the Proxy target is configurable")        \
   T(ProxyTrapViolatesInvariant,                                                \
     "Result of trap '%' is inconsistent with proxy's target")                  \
   T(RedefineDisallowed, "Cannot redefine property: %")                         \