Revert "DevTools: introduce Reattach message, get rid of DevToolsRuntimeProperties map"

This reverts commit 103920. WebKit dependency is not updated yet.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8137004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103922 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 30 insertions, 17 deletions

diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc
index 1934641..c9a27bb 100644
--- a/content/renderer/devtools_agent.cc
+++ b/content/renderer/devtools_agent.cc
@@ -78,7 +78,6 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DevToolsAgent, message)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
-    IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_FrontendLoaded, OnFrontendLoaded)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
@@ -112,9 +111,22 @@ int DevToolsAgent::hostIdentifier() {
   return routing_id();
 }
 
-void DevToolsAgent::saveAgentRuntimeState(
-    const WebKit::WebString& state) {
-  Send(new DevToolsHostMsg_SaveAgentRuntimeState(routing_id(), state.utf8()));
+void DevToolsAgent::runtimeFeatureStateChanged(
+    const WebKit::WebString& feature,
+    bool enabled) {
+  Send(new DevToolsHostMsg_RuntimePropertyChanged(
+      routing_id(),
+      feature.utf8(),
+      enabled ? "true" : "false"));
+}
+
+void DevToolsAgent::runtimePropertyChanged(
+    const WebKit::WebString& name,
+    const WebKit::WebString& value) {
+  Send(new DevToolsHostMsg_RuntimePropertyChanged(
+      routing_id(),
+      name.utf8(),
+      value.utf8()));
 }
 
 WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
@@ -144,19 +156,18 @@ DevToolsAgent* DevToolsAgent::FromHostId(int host_id) {
   return NULL;
 }
 
-void DevToolsAgent::OnAttach() {
+void DevToolsAgent::OnAttach(
+    const DevToolsRuntimeProperties& runtime_properties) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->attach();
     is_attached_ = true;
-  }
-}
-
-void DevToolsAgent::OnReattach(const std::string& agent_state) {
-  WebDevToolsAgent* web_agent = GetWebAgent();
-  if (web_agent) {
-    web_agent->reattach(WebString::fromUTF8(agent_state));
-    is_attached_ = true;
+    for (DevToolsRuntimeProperties::const_iterator it =
+             runtime_properties.begin();
+         it != runtime_properties.end(); ++it) {
+      web_agent->setRuntimeProperty(WebString::fromUTF8(it->first),
+                                    WebString::fromUTF8(it->second));
+    }
   }
 }
 
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools_agent.h
index a527569..64d6254 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -49,15 +49,17 @@ class DevToolsAgent : public content::RenderViewObserver,
   virtual void sendDebuggerOutput(const WebKit::WebString& data);
 
   virtual int hostIdentifier();
-  virtual void saveAgentRuntimeState(const WebKit::WebString& state);
+  virtual void runtimeFeatureStateChanged(const WebKit::WebString& feature,
+                                          bool enabled);
+  virtual void runtimePropertyChanged(const WebKit::WebString& name,
+                                      const WebKit::WebString& value);
   virtual WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
       createClientMessageLoop();
   virtual bool exposeV8DebuggerProtocol();
   virtual void clearBrowserCache();
   virtual void clearBrowserCookies();
 
-  void OnAttach();
-  void OnReattach(const std::string& agent_state);
+  void OnAttach(const DevToolsRuntimeProperties& runtime_properties);
   void OnDetach();
   void OnFrontendLoaded();
   void OnDispatchOnInspectorBackend(const std::string& message);
diff --git a/content/renderer/worker_devtools_agent_proxy.cc b/content/renderer/worker_devtools_agent_proxy.cc
index 7f898ad..6a1907b 100644
--- a/content/renderer/worker_devtools_agent_proxy.cc
+++ b/content/renderer/worker_devtools_agent_proxy.cc
@@ -44,7 +44,7 @@ bool WorkerDevToolsAgentProxy::OnMessageReceived(const IPC::Message& message) {
 }
 
 void WorkerDevToolsAgentProxy::AttachDevTools() {
-  Send(new DevToolsAgentMsg_Attach(route_id_));
+  Send(new DevToolsAgentMsg_Attach(route_id_, DevToolsRuntimeProperties()));
 }
 
 void WorkerDevToolsAgentProxy::DetachDevTools() {