Remove JSBuiltinsObject.

test/cctest/test-object-observe.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 734 matching lines @@
         .FromJust();
     CHECK(CompileRun("Object.getNotifier(obj)")->IsObject());
   }
 }
 
 
 static int GetGlobalObjectsCount() {
   int count = 0;
   i::HeapIterator it(CcTest::heap());
   for (i::HeapObject* object = it.next(); object != NULL; object = it.next())
-    if (object->IsJSGlobalObject()) count++;
-  return count;
+    if (object->IsJSGlobalObject()) {
+      i::JSGlobalObject* g = i::JSGlobalObject::cast(object);
+      // Skip dummy global object.
+      if (i::GlobalDictionary::cast(g->properties())->NumberOfElements() != 0) {
+        count++;
+      }
+    }
+  // Subtract one to compensate for the code stub context that is always present
+  return count - 1;
 }
 
 
 static void CheckSurvivingGlobalObjectsCount(int expected) {
   // We need to collect all garbage twice to be sure that everything
   // has been collected.  This is because inline caches are cleared in
   // the first garbage collection but some of the maps have already
   // been marked at that point.  Therefore some of the maps are not
   // collected until the second garbage collection.
   CcTest::heap()->CollectAllGarbage();
@@ skipping 20 matching lines @@
     context2->Global()
         ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
               object)
         .FromJust();
     CompileRun("function observer() {};"
                "Object.observe(obj, observer, ['foo', 'bar', 'baz']);"
                "Object.unobserve(obj, observer);");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
-  CheckSurvivingGlobalObjectsCount(2);
+  CheckSurvivingGlobalObjectsCount(1);
 }
 
 
 TEST(DontLeakContextOnGetNotifier) {
   HandleScope scope(CcTest::isolate());
   Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
   Local<Value> object = CompileRun("obj");
   {
     HandleScope scope(CcTest::isolate());
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
     context2->Global()
         ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
               object)
         .FromJust();
     CompileRun("Object.getNotifier(obj);");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
-  CheckSurvivingGlobalObjectsCount(2);
+  CheckSurvivingGlobalObjectsCount(1);
 }
 
 
 TEST(DontLeakContextOnNotifierPerformChange) {
   HandleScope scope(CcTest::isolate());
   Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
   Local<Value> object = CompileRun("obj");
@@ skipping 10 matching lines @@
         ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
               v8_str("notifier"), notifier)
         .FromJust();
     CompileRun("var obj2 = {};"
                "var notifier2 = Object.getNotifier(obj2);"
                "notifier2.performChange.call("
                    "notifier, 'foo', function(){})");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
-  CheckSurvivingGlobalObjectsCount(2);
+  CheckSurvivingGlobalObjectsCount(1);
 }
 
 
 static void ObserverCallback(const FunctionCallbackInfo<Value>& args) {
   *static_cast<int*>(Local<External>::Cast(args.Data())->Value()) =
       Local<Array>::Cast(args[0])->Length();
 }
 
 
 TEST(ObjectObserveCallsCppFunction) {
@@ skipping 165 matching lines @@
                          v8::Isolate::GetCurrent()->GetCurrentContext())
           .ToLocalChecked();
   env->Global()
       ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
             new_instance)
       .FromJust();
   v8::TryCatch try_catch(isolate);
   CompileRun("Object.getNotifier(obj)");
   CHECK(try_catch.HasCaught());
 }