Merge DevTools Refactor CL to Blink36

Source/core/inspector/InspectorHeapProfilerAgent.cpp

 /*
  * Copyright (C) 2013 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 267 matching lines @@
     unsigned id = heapSnapshotObjectId.toUInt(&ok);
     if (!ok) {
         *error = "Invalid heap snapshot object id";
         return;
     }
     ScriptObject heapObject = ScriptProfiler::objectByHeapObjectId(id);
     if (heapObject.isEmpty()) {
         *error = "Object is not available";
         return;
     }
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(heapObject.scriptState());
+    InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptFor(heapObject.scriptState());
     if (injectedScript.isEmpty()) {
         *error = "Object is not available. Inspected context is gone";
         return;
     }
     result = injectedScript.wrapObject(heapObject, objectGroup ? *objectGroup : "");
     if (!result)
         *error = "Failed to wrap object";
 }
 
 void InspectorHeapProfilerAgent::getHeapObjectId(ErrorString* errorString, const String& objectId, String* heapSnapshotObjectId)
 {
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+    InjectedScript& injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
     if (injectedScript.isEmpty()) {
         *errorString = "Inspected context has gone";
         return;
     }
-    ScriptValue value = injectedScript.findObjectById(objectId);
+    if (!injectedScript.isJavaScript()) {
+        *errorString = "The heap profiler does not yet work for Dart.";
+        return;
+    }
+
+    V8InjectedScript& v8InjectedScript = static_cast<V8InjectedScript&>(injectedScript);
+
+    ScriptValue value = v8InjectedScript.findObjectById(objectId);
     V8ScriptState::Scope scope(injectedScript.scriptState()->v8ScriptState());
+
     if (value.isEmpty() || value.isUndefined()) {
         *errorString = "Object with given id not found";
         return;
     }
     unsigned id = ScriptProfiler::getHeapObjectId(value);
     *heapSnapshotObjectId = String::number(id);
 }
 
 } // namespace WebCore