Reland of DevTools: remove V8ScriptRunner use from InjectedScript*.

third_party/WebKit/Source/core/inspector/InjectedScriptNative.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/inspector/InjectedScriptNative.h"
 
-#include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8HiddenValue.h"
 #include "platform/JSONValues.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 InjectedScriptNative::InjectedScriptNative(v8::Isolate* isolate)
     : m_lastBoundObjectId(1)
     , m_isolate(isolate)
     , m_idToWrappedObject(m_isolate)
 {
 }
 
+static const char privateKeyName[] = "v8-inspector#injectedScript";
+
 InjectedScriptNative::~InjectedScriptNative() { }
 
 void InjectedScriptNative::setOnInjectedScriptHost(v8::Local<v8::Object> injectedScriptHost)
 {
     v8::HandleScope handleScope(m_isolate);
     v8::Local<v8::External> external = v8::External::New(m_isolate, this);
-    V8HiddenValue::setHiddenValue(ScriptState::current(m_isolate), injectedScriptHost, V8HiddenValue::injectedScriptNative(m_isolate), external);
+    v8::Local<v8::Private> privateKey = v8::Private::ForApi(m_isolate, v8::String::NewFromUtf8(m_isolate, privateKeyName));
+    injectedScriptHost->SetPrivate(m_isolate->GetCurrentContext(), privateKey, external);
 }
 
 InjectedScriptNative* InjectedScriptNative::fromInjectedScriptHost(v8::Local<v8::Object> injectedScriptObject)
 {
     v8::Isolate* isolate = injectedScriptObject->GetIsolate();
     v8::HandleScope handleScope(isolate);
-    v8::Local<v8::Value> value = V8HiddenValue::getHiddenValue(ScriptState::current(isolate), injectedScriptObject, V8HiddenValue::injectedScriptNative(isolate));
-    ASSERT(!value.IsEmpty());
+    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, v8::String::NewFromUtf8(isolate, privateKeyName));
+    v8::Local<v8::Value> value;
+    RELEASE_ASSERT(injectedScriptObject->GetPrivate(context, privateKey).ToLocal(&value));
     v8::Local<v8::External> external = value.As<v8::External>();
     void* ptr = external->Value();
     ASSERT(ptr);
     return static_cast<InjectedScriptNative*>(ptr);
 }
 
 int InjectedScriptNative::bind(v8::Local<v8::Value> value, const String& groupName)
 {
     if (m_lastBoundObjectId <= 0)
         m_lastBoundObjectId = 1;
@@ skipping 42 matching lines @@
 
 String InjectedScriptNative::groupName(int objectId) const
 {
     if (objectId <= 0)
         return String();
     return m_idToObjectGroupName.get(objectId);
 }
 
 } // namespace blink