1 files changed, 5 insertions, 20 deletions
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index f4b1a86..fbb06f8 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -206,19 +206,6 @@ void WebDevToolsAgentImpl::attach()
     WebCString debuggerScriptJs = m_client->debuggerScriptSource();
     WebCore::ScriptDebugServer::shared().setDebuggerScriptSource(
         WTF::String(debuggerScriptJs.data(), debuggerScriptJs.length()));
-
-    // TODO(yurys): the source should have already been pushed by the frontend.
-    WebCString injectedScriptJs = m_client->injectedScriptSource();
-    String injectedScriptSource = String::fromUTF8(injectedScriptJs.data(), injectedScriptJs.length());
-    const char* varDefinition = "var injectedScriptConstructor = ";
-    int pos = injectedScriptSource.find(varDefinition);
-    if (pos == -1) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
-    pos += String(varDefinition).length();
-    injectedScriptSource = injectedScriptSource.substring(pos);
-    inspectorController()->injectedScriptHost()->setInjectedScriptSource(injectedScriptSource);
     m_attached = true;
 }
 
@@ -237,7 +224,8 @@ void WebDevToolsAgentImpl::detach()
 void WebDevToolsAgentImpl::frontendLoaded()
 {
     inspectorController()->connectFrontend();
-    m_client->runtimePropertyChanged(kFrontendConnectedFeatureName, "true");
+    // We know that by this time injected script has already been pushed to the backend.
+    m_client->runtimePropertyChanged(kFrontendConnectedFeatureName, inspectorController()->injectedScriptHost()->injectedScriptSource());
 }
 
 void WebDevToolsAgentImpl::didNavigate()
@@ -266,11 +254,6 @@ void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point)
     m_webViewImpl->inspectElementAt(point);
 }
 
-void WebDevToolsAgentImpl::setRuntimeFeatureEnabled(const WebString& feature, bool enabled)
-{
-    setRuntimeProperty(feature, enabled ? String("true") : String("false"));
-}
-
 void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebString& value)
 {
     if (name == kApuAgentFeatureName)
@@ -283,8 +266,10 @@ void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebSt
           ic->enableResourceTracking(false /* not sticky */, false /* no reload */);
         else
           ic->disableResourceTracking(false /* not sticky */);
-    } else if (name == kFrontendConnectedFeatureName && value == "true" && !inspectorController()->hasFrontend())
+    } else if (name == kFrontendConnectedFeatureName && !inspectorController()->hasFrontend()) {
+        inspectorController()->injectedScriptHost()->setInjectedScriptSource(value);
         frontendLoaded();
+    }
 }
 
 void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)