Split --harmony-unicode and --harmony-unicode-regexps.

src/runtime/runtime-regexp.cc

Index: src/runtime/runtime-regexp.cc
diff --git a/src/runtime/runtime-regexp.cc b/src/runtime/runtime-regexp.cc
index 64a2d57cf5edabad5b02d953c6ccd5367e98647d..57ff1b2f514ba465c24ecd0f27072a7ef4e4f265 100644
--- a/src/runtime/runtime-regexp.cc
+++ b/src/runtime/runtime-regexp.cc
@@ -819,7 +819,7 @@ static JSRegExp::Flags RegExpFlagsFromString(Handle<String> flags,
         flag = JSRegExp::MULTILINE;
         break;
       case 'u':
-        if (!FLAG_harmony_unicode) return JSRegExp::Flags(0);
+        if (!FLAG_harmony_unicode_regexps) return JSRegExp::Flags(0);
         flag = JSRegExp::UNICODE_ESCAPES;
         break;
       case 'y':
@@ -867,7 +867,7 @@ RUNTIME_FUNCTION(Runtime_RegExpInitializeAndCompile) {
 
   Map* map = regexp->map();
   Object* constructor = map->constructor();
-  if (!FLAG_harmony_regexps && !FLAG_harmony_unicode &&
+  if (!FLAG_harmony_regexps && !FLAG_harmony_unicode_regexps &&
       constructor->IsJSFunction() &&
       JSFunction::cast(constructor)->initial_map() == map) {
     // If we still have the original map, set in-object properties directly.
@@ -902,7 +902,7 @@ RUNTIME_FUNCTION(Runtime_RegExpInitializeAndCompile) {
       JSObject::SetOwnPropertyIgnoreAttributes(regexp, factory->sticky_string(),
                                                sticky, final).Check();
     }
-    if (FLAG_harmony_unicode) {
+    if (FLAG_harmony_unicode_regexps) {
       JSObject::SetOwnPropertyIgnoreAttributes(
           regexp, factory->unicode_string(), unicode, final).Check();
     }