Enable inspector tests disabled when dart:html was switched to JS interop.

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 253 matching lines @@
     DartApiScope apiScope;
 
     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::Context> creationContext, v8::Isolate* 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(), v8::Isolate::GetCurrent());
-
-        Dart_Handle host = JsInterop::toDart(scriptHostWrapper, false);
-        Dart_SetPeer(host, this);
-        Dart_Handle consoleApi = DartUtilities::invokeUtilsMethod("consoleApi", 1, &host);
+        Dart_Handle injecteScriptV8 = JsInterop::toDart(m_injectedScriptManager->injectedScriptFor(m_scriptState->v8ScriptState()).injectedScriptObject().v8Value(), false);
+        Dart_Handle consoleApi = DartUtilities::invokeUtilsMethod("consoleApi", 1, &injecteScriptV8);
         ASSERT(!Dart_IsError(consoleApi));
         m_consoleApi = Dart_NewPersistentHandle(consoleApi);
     }
     return m_consoleApi;
 }
 
 Dart_Handle DartInjectedScript::evaluateHelper(Dart_Handle target, const String& rawExpression, Dart_Handle localVariables, bool includeCommandLineAPI, Dart_Handle& exception)
 {
     DartDOMData* domData = DartDOMData::current();
     ALLOW_UNUSED_LOCAL(domData);
@@ skipping 11 matching lines @@
             ASSERT(!exception);
         }
 
         ScriptState* scriptState = DartUtilities::v8ScriptStateForCurrentIsolate();
         for (unsigned i = 0; i < 6; i++) {
             ScriptValue value =  m_host->inspectedObject(i)->get(scriptState);
             v8::TryCatch tryCatch;
             v8::Handle<v8::Value> v8Value = value.v8Value();
             if (v8Value.IsEmpty())
                 break;
-            Dart_Handle dartValue = DartHandleProxy::unwrapValue(v8Value);
+            Dart_Handle dartValue = JsInterop::toDart(v8Value, true);
             ASSERT(!Dart_IsError(dartValue));
-            if (Dart_IsNull(dartValue))
+            if (Dart_IsError(dartValue) || Dart_IsNull(dartValue))
                 continue;
             locals.append(DartUtilities::stringToDartString(String::format("$%d", i)));
             locals.append(dartValue);
         }
 
         Dart_Handle list = consoleApi();
         intptr_t length = 0;
         ASSERT(Dart_IsList(list));
         Dart_Handle ret = Dart_ListLength(list, &length);
         ALLOW_UNUSED_LOCAL(ret);
@@ skipping 1114 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