Fix bug where Dart execution contexts were getting the wrong execution context id.

Source/core/inspector/PageRuntimeAgent.cpp

 /*
  * Copyright (C) 2011 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/PageRuntimeAgent.h"
 
 #include "bindings/core/dart/DartController.h"
+#include "bindings/core/dart/DartInspectorRuntimeAgent.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InstrumentingAgents.h"
@@ skipping 138 matching lines @@
         }
         isolatedContexts.clear();
     }
 }
 
 // WARNING: this had to be rewritten due to the ScriptState refactor.
 // Dart specific method.
 void PageRuntimeAgent::notifyDartContextCreated(const String& frameId, ScriptState* v8ScriptState)
 {
     ExecutionContext* executionContext = v8ScriptState->executionContext();
-    int executionContextId = injectedScriptManager()->injectedScriptIdFor(v8ScriptState);
     DartController* dartController = DartController::retrieve(executionContext);
     if (dartController) {
         Vector<DartScriptState*> scriptStates;
         dartController->collectScriptStates(v8ScriptState, scriptStates);
         // TODO(jacobr): now that there is a human readable name field we could possibly leave orign blank.
         for (size_t i = 0; i< scriptStates.size(); i++) {
             DartScriptState* state = scriptStates[i];
-            addExecutionContextToFrontendDart(executionContextId, "", *(state->name()), *(state->name()), frameId, "Dart", state->libraryId());
+            m_dart->addExecutionContextToFrontendHelper(state, true, *(state->name()), frameId);
         }
     }
 }
 // End Dart specific method.
 
 void PageRuntimeAgent::reportExecutionContext(ScriptState* scriptState, bool isPageContext, const String& origin, const String& frameId)
 {
     int executionContextId = injectedScriptManager()->injectedScriptIdFor(scriptState);
     m_scriptStateToId.set(scriptState, executionContextId);
     DOMWrapperWorld& world = scriptState->world();
     String humanReadableName = world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "";
     String type = isPageContext ? "" : "Extension";
     InspectorRuntimeAgent::addExecutionContextToFrontend(executionContextId, type, origin, humanReadableName, frameId);
 }
 
 } // namespace blink