Now that WebKit r96590 is rolled, reapply http://codereview.chromium.org/8135002/ which was reverted due to compilation errors.

We want agent to save its state into a string instead of using a map of
runtime properties. Also the serialized state should be taken into account
only when existing client is reattached from one agent to another, this
is why we introduce Reattach message.

Also see https://bugs.webkit.org/show_bug.cgi?id=69335

BUG=None
TEST=None
TBR=pfeldman,jam

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

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

1 files changed, 6 insertions, 12 deletions

diff --git a/content/browser/debugger/devtools_manager.h b/content/browser/debugger/devtools_manager.h
index 1104203..623e0c9 100644
--- a/content/browser/debugger/devtools_manager.h
+++ b/content/browser/debugger/devtools_manager.h
@@ -25,8 +25,6 @@ class PrefService;
 class RenderViewHost;
 class TabContents;
 
-typedef std::map<std::string, std::string> DevToolsRuntimeProperties;
-
 // This class is a singleton that manages DevToolsClientHost instances and
 // routes messages between developer tools clients and agents.
 //
@@ -57,9 +55,8 @@ class CONTENT_EXPORT DevToolsManager
   void ForwardToDevToolsClient(DevToolsAgentHost* agent_host,
                                const IPC::Message& message);
 
-  void RuntimePropertyChanged(DevToolsAgentHost* agent_host,
-                              const std::string& name,
-                              const std::string& value);
+  void SaveAgentRuntimeState(DevToolsAgentHost* agent_host,
+                             const std::string& state);
 
   // Sends 'Attach' message to the agent using |dest_rvh| in case
   // there is a DevToolsClientHost registered for the |inspected_rvh|.
@@ -101,8 +98,7 @@ class CONTENT_EXPORT DevToolsManager
   DevToolsAgentHost* GetAgentHost(DevToolsClientHost* client_host);
 
   void BindClientHost(DevToolsAgentHost* agent_host,
-                      DevToolsClientHost* client_host,
-                      const DevToolsRuntimeProperties& runtime_properties);
+                      DevToolsClientHost* client_host);
   void UnbindClientHost(DevToolsAgentHost* agent_host,
                         DevToolsClientHost* client_host);
 
@@ -120,12 +116,10 @@ class CONTENT_EXPORT DevToolsManager
       ClientHostToInspectedRvhMap;
   ClientHostToInspectedRvhMap client_to_agent_host_;
 
-  typedef std::map<DevToolsAgentHost*, DevToolsRuntimeProperties>
-      RuntimePropertiesMap;
-  RuntimePropertiesMap runtime_properties_map_;
+  typedef std::map<DevToolsAgentHost*, std::string> AgentRuntimeStates;
+  AgentRuntimeStates agent_runtime_states_;
 
-  typedef std::map<int,
-                   std::pair<DevToolsClientHost*, DevToolsRuntimeProperties> >
+  typedef std::map<int, std::pair<DevToolsClientHost*, std::string> >
       OrphanClientHosts;
   OrphanClientHosts orphan_client_hosts_;
   int last_orphan_cookie_;