Add an explicit dispose step for WebDevToolsAgentImpl.

Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-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 213 matching lines @@
 private:
     OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
 };
 
 WebDevToolsAgentImpl::WebDevToolsAgentImpl(
     WebViewImpl* webViewImpl,
     WebDevToolsAgentClient* client)
     : m_client(client)
     , m_webViewImpl(webViewImpl)
     , m_attached(false)
+#if ENABLE(ASSERT)
+    , m_hasBeenDisposed(false)
+#endif
     , m_instrumentingAgents(webViewImpl->page()->instrumentingAgents())
     , m_injectedScriptManager(InjectedScriptManager::createForPage())
     , m_state(adoptPtrWillBeNoop(new InspectorCompositeState(this)))
     , m_overlay(InspectorOverlay::create(webViewImpl->page(), this))
     , m_cssAgent(nullptr)
     , m_resourceAgent(nullptr)
     , m_layerTreeAgent(nullptr)
     , m_agents(m_instrumentingAgents.get(), m_state.get())
     , m_deferredAgentsInitialized(false)
     , m_generatingEvent(false)
@@ skipping 53 matching lines @@
     m_agents.append(InspectorIndexedDBAgent::create(page));
     m_agents.append(InspectorAccessibilityAgent::create(page));
     m_agents.append(InspectorDOMStorageAgent::create(page));
 
     m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(this);
     ClientMessageLoopAdapter::ensureClientMessageLoopCreated(m_client);
 }
 
 WebDevToolsAgentImpl::~WebDevToolsAgentImpl()
 {
+    ASSERT(m_hasBeenDisposed);
+}
+
+void WebDevToolsAgentImpl::dispose()
+{
+    // Explicitly dispose of the agent before destructing to ensure
+    // same behavior (and correctness) with and without Oilpan.
     ClientMessageLoopAdapter::inspectedViewClosed(m_webViewImpl);
     m_webViewImpl->settingsImpl()->setWebDevToolsAgentImpl(nullptr);
     if (m_attached)
         Platform::current()->currentThread()->removeTaskObserver(this);
+#if ENABLE(ASSERT)
+    ASSERT(!m_hasBeenDisposed);
+    m_hasBeenDisposed = true;
+#endif
 }
 
 DEFINE_TRACE(WebDevToolsAgentImpl)
 {
     visitor->trace(m_instrumentingAgents);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_state);
     visitor->trace(m_overlay);
     visitor->trace(m_asyncCallTracker);
     visitor->trace(m_domAgent);
@@ skipping 566 matching lines @@
     if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_pauseCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointByUrlCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_removeBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointsActiveCmd);
 }
 
 } // namespace blink