Revert r18451 "Revert r18449 "Reland r18383: More API cleanup." and r18450 "Unbreak build."" since …

test/cctest/cctest.h

 // Copyright 2008 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 271 matching lines @@
      context->Enter();
      // We can't do this later perhaps because of a fatal error.
      isolate_ = isolate;
   }
 
   v8::Persistent<v8::Context> context_;
   v8::Isolate* isolate_;
 };
 
 static inline v8::Local<v8::Value> v8_num(double x) {
-  return v8::Number::New(x);
+  return v8::Number::New(v8::Isolate::GetCurrent(), x);
 }
 
 
 static inline v8::Local<v8::String> v8_str(const char* x) {
   return v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), x);
 }
 
 
 static inline v8::Local<v8::Script> v8_compile(const char* x) {
   return v8::Script::Compile(v8_str(x));
 }
 
 
 // Helper function that compiles and runs the source.
 static inline v8::Local<v8::Value> CompileRun(const char* source) {
   return v8::Script::Compile(
       v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), source))->Run();
 }
 
 
 // Helper function that compiles and runs the source with given origin.
 static inline v8::Local<v8::Value> CompileRunWithOrigin(const char* source,
                                                         const char* origin_url,
                                                         int line_number,
                                                         int column_number) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::ScriptOrigin origin(v8::String::NewFromUtf8(isolate, origin_url),
-                          v8::Integer::New(line_number),
-                          v8::Integer::New(column_number));
+                          v8::Integer::New(isolate, line_number),
+                          v8::Integer::New(isolate, column_number));
   return v8::Script::Compile(v8::String::NewFromUtf8(isolate, source), &origin)
       ->Run();
 }
 
 
 // Pick a slightly different port to allow tests to be run in parallel.
 static inline int FlagDependentPortOffset() {
   return ::v8::internal::FLAG_crankshaft == false ? 100 :
          ::v8::internal::FLAG_always_opt ? 200 : 0;
 }
@@ skipping 34 matching lines @@
     CHECK_EQ(0, heap_profiler_->heap_object_map()->FindUntrackedObjects());
     heap_profiler_->StopHeapObjectsTracking();
   }
 
  private:
   i::HeapProfiler* heap_profiler_;
 };
 
 
 #endif  // ifndef CCTEST_H_