Revert of Migrate error messages, part 7.

src/object-observe.js

Index: src/object-observe.js
diff --git a/src/object-observe.js b/src/object-observe.js
index a9eb1e0324f6527ff88622ade0d1ac6378d3ad2b..11562cb236fa370f38a311a203893005cb34ef41 100644
--- a/src/object-observe.js
+++ b/src/object-observe.js
@@ -315,7 +315,8 @@
   if (IS_UNDEFINED(arg))
     return arg;
 
-  if (!IS_SPEC_OBJECT(arg)) throw MakeTypeError(kObserveInvalidAccept);
+  if (!IS_SPEC_OBJECT(arg))
+    throw MakeTypeError("observe_invalid_accept");
 
   var len = ToInteger(arg.length);
   if (len < 0) len = 0;
@@ -371,13 +372,13 @@
 
 function ObjectObserve(object, callback, acceptList) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "observe", "observe");
+    throw MakeTypeError("observe_non_object", ["observe"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "observe");
+    throw MakeTypeError("observe_global_proxy", ["observe"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "observe");
+    throw MakeTypeError("observe_non_function", ["observe"]);
   if (ObjectIsFrozen(callback))
-    throw MakeTypeError(kObserveCallbackFrozen);
+    throw MakeTypeError("observe_callback_frozen");
 
   var objectObserveFn = %GetObjectContextObjectObserve(object);
   return objectObserveFn(object, callback, acceptList);
@@ -394,11 +395,11 @@
 
 function ObjectUnobserve(object, callback) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "unobserve", "unobserve");
+    throw MakeTypeError("observe_non_object", ["unobserve"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "unobserve");
+    throw MakeTypeError("observe_global_proxy", ["unobserve"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "unobserve");
+    throw MakeTypeError("observe_non_function", ["unobserve"]);
 
   var objectInfo = ObjectInfoGet(object);
   if (IS_UNDEFINED(objectInfo))
@@ -557,9 +558,9 @@
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeRecord.type))
-    throw MakeTypeError(kObserveTypeNonString);
+    throw MakeTypeError("observe_type_non_string");
 
   ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord);
 }
@@ -571,11 +572,11 @@
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeType))
-    throw MakeTypeError(kObservePerformNonString);
+    throw MakeTypeError("observe_perform_non_string");
   if (!IS_SPEC_FUNCTION(changeFn))
-    throw MakeTypeError(kObservePerformNonFunction);
+    throw MakeTypeError("observe_perform_non_function");
 
   var performChangeFn = %GetObjectContextNotifierPerformChange(objectInfo);
   performChangeFn(objectInfo, changeType, changeFn);
@@ -599,9 +600,9 @@
 
 function ObjectGetNotifier(object) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "getNotifier", "getNotifier");
+    throw MakeTypeError("observe_non_object", ["getNotifier"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "getNotifier");
+    throw MakeTypeError("observe_global_proxy", ["getNotifier"]);
 
   if (ObjectIsFrozen(object)) return null;
 
@@ -643,7 +644,7 @@
 
 function ObjectDeliverChangeRecords(callback) {
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "deliverChangeRecords");
+    throw MakeTypeError("observe_non_function", ["deliverChangeRecords"]);
 
   while (CallbackDeliverPending(callback)) {}
 }