[DevTools] Fix frontend host race and assert.

third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp

 /*
  * Copyright (C) 2010 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 26 matching lines @@
 #include "core/inspector/DevToolsHost.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebDevToolsFrontendClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
 WebDevToolsFrontend* WebDevToolsFrontend::create(
-    WebView* view,
-    WebDevToolsFrontendClient* client,
-    const WebString& applicationLocale)
-{
-    return new WebDevToolsFrontendImpl(toWebLocalFrameImpl(view->mainFrame()), client);
-}
-
-WebDevToolsFrontend* WebDevToolsFrontend::create(
     WebLocalFrame* frame,
-    WebDevToolsFrontendClient* client,
-    const WebString& applicationLocale)
+    WebDevToolsFrontendClient* client)
 {
     return new WebDevToolsFrontendImpl(toWebLocalFrameImpl(frame), client);
 }
 
 WebDevToolsFrontendImpl::WebDevToolsFrontendImpl(
     WebLocalFrameImpl* webFrame,
     WebDevToolsFrontendClient* client)
     : m_webFrame(webFrame)
     , m_client(client)
 {
     m_webFrame->setDevToolsFrontend(this);
 }
 
 WebDevToolsFrontendImpl::~WebDevToolsFrontendImpl()
 {
+    if (m_devtoolsHost)
+        m_devtoolsHost->disconnectClient();
 }
 
 void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame)
 {
     if (m_webFrame == frame) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame());
         ScriptState::Scope scope(scriptState);
 
         if (m_devtoolsHost)
@@ skipping 36 matching lines @@
 {
     WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoint(x, y, menuProvider);
 }
 
 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, const String& source)
 {
     m_injectedScriptForOrigin.set(origin, source);
 }
 
 } // namespace blink