DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting

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 118 matching lines @@
 
 void PageDebuggerAgent::overlaySteppedOver()
 {
     ErrorString error;
     stepOver(&error);
 }
 
 InjectedScript PageDebuggerAgent::defaultInjectedScript()
 {
     ScriptState* scriptState = ScriptState::forMainWorld(m_pageAgent->inspectedFrame());
-    return injectedScriptManager()->injectedScriptFor(scriptState);
+    return m_v8DebuggerAgent->injectedScriptManager()->injectedScriptFor(scriptState);
 }
 
 void PageDebuggerAgent::didStartProvisionalLoad(LocalFrame* frame)
 {
     if (frame == m_pageAgent->inspectedFrame()) {
         ErrorString error;
         resume(&error);
     }
 }
 
 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     // FIXME: what about nested objects?
     if (frame != m_pageAgent->inspectedFrame())
         return;
-    reset();
+    m_v8DebuggerAgent->reset();
 }
 
 void PageDebuggerAgent::compileScript(ErrorString* errorString, const String& expression, const String& sourceURL, bool persistScript, const int* executionContextId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>& exceptionDetails)
 {
-    InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
+    InjectedScript injectedScript = m_v8DebuggerAgent->injectedScriptForEval(errorString, executionContextId);
     if (injectedScript.isEmpty()) {
         *errorString = "Inspected frame has gone";
         return;
     }
     ExecutionContext* executionContext = injectedScript.scriptState()->executionContext();
     RefPtrWillBeRawPtr<LocalFrame> protect(toDocument(executionContext)->frame());
     InspectorDebuggerAgent::compileScript(errorString, expression, sourceURL, persistScript, executionContextId, scriptId, exceptionDetails);
     if (!scriptId->isAssigned())
         return;
 
     String scriptIdValue = scriptId->getValue();
     if (!scriptIdValue.isEmpty())
         m_compiledScriptURLs.set(scriptId->getValue(), sourceURL);
 }
 
 void PageDebuggerAgent::runScript(ErrorString* errorString, const ScriptId& scriptId, const int* executionContextId, const String* const objectGroup, const bool* const doNotPauseOnExceptionsAndMuteConsole, RefPtr<RemoteObject>& result, RefPtr<ExceptionDetails>& exceptionDetails)
 {
-    InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
+    InjectedScript injectedScript = m_v8DebuggerAgent->injectedScriptForEval(errorString, executionContextId);
     if (injectedScript.isEmpty()) {
         *errorString = "Inspected frame has gone";
         return;
     }
     ExecutionContext* executionContext = injectedScript.scriptState()->executionContext();
 
     String sourceURL = m_compiledScriptURLs.take(scriptId);
     LocalFrame* frame = toDocument(executionContext)->frame();
     TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition().m_line.oneBasedInt()));
     InspectorInstrumentationCookie cookie;
     if (frame)
-        cookie = InspectorInstrumentation::willEvaluateScript(frame, sourceURL, TextPosition::minimumPosition().m_line.oneBasedInt());
+        cookie = InspectorInstrumentation::willEvaluateScript(frame);
 
     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