DevTools: make V8DebuggerAgent call Client instead of overriden methods

Source/core/inspector/PageDebuggerAgent.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 80 matching lines @@
     }
     InspectorDebuggerAgent::enable(errorString);
 }
 
 void PageDebuggerAgent::restore()
 {
     if (canExecuteScripts())
         InspectorDebuggerAgent::restore();
 }
 
-void PageDebuggerAgent::enable()
-{
-    ASSERT(canExecuteScripts());
-    InspectorDebuggerAgent::enable();
-    m_instrumentingAgents->setPageDebuggerAgent(this);
-}
-
-void PageDebuggerAgent::disable()
-{
-    InspectorDebuggerAgent::disable();
-    m_instrumentingAgents->setPageDebuggerAgent(0);
-    m_compiledScriptURLs.clear();
-}
-
 void PageDebuggerAgent::startListeningV8Debugger()
 {
+    ASSERT(canExecuteScripts());
     m_mainThreadDebugger->addListener(this, m_pageAgent->inspectedFrame());
+    m_instrumentingAgents->setPageDebuggerAgent(this);
+    InspectorDebuggerAgent::startListeningV8Debugger();
 }
 
 void PageDebuggerAgent::stopListeningV8Debugger()
 {
     m_mainThreadDebugger->removeListener(this, m_pageAgent->inspectedFrame());
+    m_instrumentingAgents->setPageDebuggerAgent(nullptr);
+    m_compiledScriptURLs.clear();
+    InspectorDebuggerAgent::stopListeningV8Debugger();
 }
 
 void PageDebuggerAgent::muteConsole()
 {
     FrameConsole::mute();
 }
 
 void PageDebuggerAgent::unmuteConsole()
 {
     FrameConsole::unmute();
 }
 
 void PageDebuggerAgent::overlayResumed()
 {
     ErrorString error;
     resume(&error);
 }
 
 void PageDebuggerAgent::overlaySteppedOver()
 {
     ErrorString error;
     stepOver(&error);
 }
 
-InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
+InjectedScript PageDebuggerAgent::defaultInjectedScript()
 {
-    if (!executionContextId) {
-        ScriptState* scriptState = ScriptState::forMainWorld(m_pageAgent->inspectedFrame());
-        InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
-        if (result.isEmpty())
-            *errorString = "Internal error: main world execution context not found.";
-        return result;
-    }
-    InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
-    if (injectedScript.isEmpty())
-        *errorString = "Execution context with given id not found.";
-    return injectedScript;
+    ScriptState* scriptState = ScriptState::forMainWorld(m_pageAgent->inspectedFrame());
+    return injectedScriptManager()->injectedScriptFor(scriptState);
 }
 
 void PageDebuggerAgent::didStartProvisionalLoad(LocalFrame* frame)
 {
     if (frame == m_pageAgent->inspectedFrame()) {
         ErrorString error;
         resume(&error);
     }
 }
 
@@ skipping 47 matching lines @@
     RefPtrWillBeRawPtr<LocalFrame> protect(frame);
     InspectorDebuggerAgent::runScript(errorString, scriptId, executionContextId, objectGroup, doNotPauseOnExceptionsAndMuteConsole, result, exceptionDetails);
 
     if (frame)
         InspectorInstrumentation::didEvaluateScript(cookie);
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
 
 }
 
 } // namespace blink