Fix compile errors from merge of all dartium changes over the past 4 months.

Source/bindings/core/dart/DartInjectedScript.cpp

 /*
  * Copyright (C) 2014 Google Inc. 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
@@ skipping 22 matching lines @@
 #include "bindings/core/dart/DartInjectedScript.h"
 
 #include "bindings/core/dart/DartDOMWrapper.h"
 #include "bindings/core/dart/DartHandleProxy.h"
 #include "bindings/core/dart/DartJsInterop.h"
 #include "bindings/core/dart/DartScriptDebugServer.h"
 #include "bindings/core/dart/DartScriptState.h"
 #include "bindings/core/dart/DartUtilities.h"
 #include "bindings/core/dart/V8Converter.h"
 #include "bindings/core/v8/ScriptFunctionCall.h"
-#include "bindings/core/v8/V8InjectedScriptHost.h"
+#include "bindings/core/v8/V8DOMWrapper.h"
+#include "bindings/core/v8/inspector/V8InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/JSONParser.h"
 #include "platform/JSONValues.h"
 
 using blink::TypeBuilder::Array;
 using blink::TypeBuilder::Debugger::CallFrame;
 using blink::TypeBuilder::Debugger::Location;
 using blink::TypeBuilder::Debugger::Scope;
 using blink::TypeBuilder::Runtime::PropertyDescriptor;
 using blink::TypeBuilder::Runtime::InternalPropertyDescriptor;
@@ skipping 210 matching lines @@
 
     for (DebuggerObjectMap::iterator it = m_objects.begin(); it != m_objects.end(); ++it) {
         delete it->value;
     }
 
     if (m_consoleApi)
         Dart_DeletePersistentHandle(m_consoleApi);
 }
 
 // Copied from V8injectedScriptManager.
-v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(PassRefPtrWillBeRawPtr<InjectedScriptHost> host, InjectedScriptManager* injectedScriptManager, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
+v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(PassRefPtrWillBeRawPtr<InjectedScriptHost> host, InjectedScriptManager* injectedScriptManager, v8::Handle<v8::Context> creationContext, v8::Isolate* isolate)
 {
-    return V8DOMWrapper::createWrapper(creationContext, &V8InjectedScriptHost::wrapperTypeInfo,
-        host->toScriptWrappableBase(), isolate);
+    // TODO(jacobr): is this correct.
+    v8::Local<v8::FunctionTemplate> wrapperTemplate = host->wrapperTemplate(isolate);
+    ASSERT(!wrapperTemplate.IsEmpty());
+    if (wrapperTemplate.IsEmpty()) {
+        // Hopefully this isn't needed.
+        wrapperTemplate = V8InjectedScriptHost::createWrapperTemplate(isolate);
+        host->setWrapperTemplate(wrapperTemplate, isolate);
+    }
+
+    return V8InjectedScriptHost::wrap(wrapperTemplate, creationContext, host);
 }
 
 Dart_Handle DartInjectedScript::consoleApi()
 {
     if (!m_consoleApi) {
         V8Scope v8scope(DartDOMData::current());
-        v8::Local<v8::Object> scriptHostWrapper = createInjectedScriptHostV8Wrapper(m_host, m_injectedScriptManager, m_scriptState->v8ScriptState()->context()->Global(), v8::Isolate::GetCurrent());
+        v8::Local<v8::Object> scriptHostWrapper = createInjectedScriptHostV8Wrapper(m_host, m_injectedScriptManager, m_scriptState->v8ScriptState()->context(), v8::Isolate::GetCurrent());
 
         Dart_Handle host = JsInterop::toDart(scriptHostWrapper, false);
         Dart_SetPeer(host, this);
         Dart_Handle consoleApi = DartUtilities::invokeUtilsMethod("consoleApi", 1, &host);
         ASSERT(!Dart_IsError(consoleApi));
         m_consoleApi = Dart_NewPersistentHandle(consoleApi);
     }
     return m_consoleApi;
 }
 
@@ skipping 1152 matching lines @@
     RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
     if (parsedObjectId && parsedObjectId->type() == JSONValue::TypeObject) {
         bool isDart = false;
         bool success = parsedObjectId->asObject()-> getBoolean("isDart", &isDart);
         return success && isDart;
     }
     return false;
 }
 
 } // namespace blink