[DevTools] Do not instrument with InspectorInspectorAgent.

Source/core/inspector/InspectorInspectorAgent.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 41 matching lines @@
 }
 
 InspectorInspectorAgent::InspectorInspectorAgent(InjectedScriptManager* injectedScriptManager)
     : InspectorBaseAgent<InspectorInspectorAgent, InspectorFrontend::Inspector>("Inspector")
     , m_injectedScriptManager(injectedScriptManager)
 {
 }
 
 InspectorInspectorAgent::~InspectorInspectorAgent()
 {
-#if !ENABLE(OILPAN)
-    m_instrumentingAgents->setInspectorInspectorAgent(nullptr);
-#endif
 }
 
 DEFINE_TRACE(InspectorInspectorAgent)
 {
     visitor->trace(m_injectedScriptManager);
     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);
     m_pendingEvaluateTestCommands.clear();
 }
 
 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;
 
     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)) {
         frontend()->evaluateForTestInFrontend(static_cast<int>(callId), script);
         frontend()->flush();
     } else {
         m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
     }
 }
 
 void InspectorInspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<JSONObject> hints)
 {
     if (frontend() && m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled))
         frontend()->inspect(objectToInspect, hints);
 }
 
 } // namespace blink