Merge bleeding_edge r17376:17693.

test/cctest/test-debug.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 151 matching lines @@
     v8::internal::Debug* debug = isolate->debug();
     // Expose the debug context global object in the global object for testing.
     debug->Load();
     debug->debug_context()->set_security_token(
         v8::Utils::OpenHandle(*context_)->security_token());
 
     Handle<JSGlobalProxy> global(Handle<JSGlobalProxy>::cast(
         v8::Utils::OpenHandle(*context_->Global())));
     Handle<v8::internal::String> debug_string =
         factory->InternalizeOneByteString(STATIC_ASCII_VECTOR("debug"));
-    SetProperty(isolate, global, debug_string,
-                Handle<Object>(debug->debug_context()->global_proxy(), isolate),
-                DONT_ENUM,
-                ::v8::internal::kNonStrictMode);
+    v8::internal::Runtime::SetObjectProperty(isolate, global, debug_string,
+        Handle<Object>(debug->debug_context()->global_proxy(), isolate),
+        DONT_ENUM,
+        ::v8::internal::kNonStrictMode);
   }
 
  private:
   v8::HandleScope scope_;
   v8::Local<v8::Context> context_;
 };
 
 
 // --- H e l p e r   F u n c t i o n s
 
@@ skipping 7369 matching lines @@
 TEST(LiveEditDisabled) {
   v8::internal::FLAG_allow_natives_syntax = true;
   LocalContext env;
   v8::HandleScope scope(env->GetIsolate());
   v8::Debug::SetLiveEditEnabled(false), env->GetIsolate();
   CompileRun("%LiveEditCompareStrings('', '')");
 }
 
 
 #endif  // ENABLE_DEBUGGER_SUPPORT