[DevTools] Do not instrument with InspectorInspectorAgent.

Source/core/inspector/InspectorInspectorAgent.cpp

Index: Source/core/inspector/InspectorInspectorAgent.cpp
diff --git a/Source/core/inspector/InspectorInspectorAgent.cpp b/Source/core/inspector/InspectorInspectorAgent.cpp
index 7eda7757545286eabc203fc7c427e4719ad98543..b99ea876c9b01ea4c24958284223b113ecfbac7b 100644
--- a/Source/core/inspector/InspectorInspectorAgent.cpp
+++ b/Source/core/inspector/InspectorInspectorAgent.cpp
@@ -59,9 +59,6 @@ InspectorInspectorAgent::InspectorInspectorAgent(InjectedScriptManager* injected
 
 InspectorInspectorAgent::~InspectorInspectorAgent()
 {
-#if !ENABLE(OILPAN)
-    m_instrumentingAgents->setInspectorInspectorAgent(nullptr);
-#endif
 }
 
 DEFINE_TRACE(InspectorInspectorAgent)
@@ -70,14 +67,10 @@ DEFINE_TRACE(InspectorInspectorAgent)
     InspectorBaseAgent::trace(visitor);
 }
 
-void InspectorInspectorAgent::init()
-{
-    m_instrumentingAgents->setInspectorInspectorAgent(this);
-}
-
 void InspectorInspectorAgent::enable(ErrorString*)
 {
     m_state->setBoolean(InspectorAgentState::inspectorAgentEnabled, true);
+    m_instrumentingAgents->setInspectorInspectorAgent(this);

[pfeldman, 2015/03/24 13:18:54]

I don't see why this domain should instrument anything.

[dgozman, 2015/03/24 13:19:40]

It is used by InjectedScriptHost.

 
     for (Vector<pair<long, String>>::iterator it = m_pendingEvaluateTestCommands.begin(); frontend() && it != m_pendingEvaluateTestCommands.end(); ++it)
         frontend()->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
@@ -87,12 +80,13 @@ void InspectorInspectorAgent::enable(ErrorString*)
 void InspectorInspectorAgent::disable(ErrorString*)
 {
     m_state->setBoolean(InspectorAgentState::inspectorAgentEnabled, false);
+    m_instrumentingAgents->setInspectorInspectorAgent(nullptr);
     m_pendingEvaluateTestCommands.clear();
     m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
     m_injectedScriptManager->discardInjectedScripts();
 }
 
-void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
+void InspectorInspectorAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
 {
     if (frame != frame->localFrameRoot())
         return;
@@ -100,6 +94,14 @@ void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
     m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
 }
 
+void InspectorInspectorAgent::restore()
+{
+    if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {
+        ErrorString error;
+        enable(&error);
+    }
+}
+
 void InspectorInspectorAgent::evaluateForTestInFrontend(long callId, const String& script)
 {
     if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {