[ChromeDriver] Send DOM.getDocument after each DOM.documentUpdated.

chrome/test/chromedriver/devtools_client_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/devtools_client_impl.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 26 matching lines @@
 DevToolsClientImpl::DevToolsClientImpl(
     const SyncWebSocketFactory& factory,
     const std::string& url,
     const ParserFunc& parser_func)
     : socket_(factory.Run().Pass()),
       url_(url),
       parser_func_(parser_func),
       connected_(false),
       next_id_(1) {}
 
-DevToolsClientImpl::~DevToolsClientImpl() {}
+DevToolsClientImpl::~DevToolsClientImpl() {
+  for (ResponseMap::iterator iter = cmd_response_map_.begin();
+       iter != cmd_response_map_.end(); ++iter) {
+    LOG(WARNING) << "Finished with no response for command " << iter->first;
+    delete iter->second;
+  }
+}
 
 Status DevToolsClientImpl::SendCommand(
     const std::string& method,
     const base::DictionaryValue& params) {
   scoped_ptr<base::DictionaryValue> result;
   return SendCommandInternal(method, params, &result);
 }
 
 Status DevToolsClientImpl::SendCommandAndGetResult(
     const std::string& method,
@@ skipping 41 matching lines @@
     connected_ = true;
   }
 
   int command_id = next_id_++;
   base::DictionaryValue command;
   command.SetInteger("id", command_id);
   command.SetString("method", method);
   command.Set("params", params.DeepCopy());
   std::string message;
   base::JSONWriter::Write(&command, &message);
+  LOG(INFO) << "SEND: " << message;

[craigdh, 2013/01/30 01:44:24]

Whoops. Will delete in the next patch.

   if (!socket_->Send(message)) {
     connected_ = false;
     return Status(kDisconnected, "unable to send message to renderer");
   }
 
   return ReceiveCommandResponse(command_id, result);
 }
 
 Status DevToolsClientImpl::ReceiveCommandResponse(
     int command_id,
     scoped_ptr<base::DictionaryValue>* result) {
   internal::InspectorMessageType type;
   internal::InspectorEvent event;
   internal::InspectorCommandResponse response;
-  while (true) {
+  cmd_response_map_[command_id] = NULL;
+  while (cmd_response_map_[command_id] == NULL) {
     Status status = ReceiveNextMessage(command_id, &type, &event, &response);
     if (status.IsError()) {
       return status;
     } else if (type == internal::kCommandResponseMessageType) {
-      if (response.id != command_id) {
+      if (cmd_response_map_.count(response.id) == 0) {
         return Status(kUnknownError,
                       "received response for unknown command ID");
+      } else if (response.result) {
+        cmd_response_map_[response.id] = response.result.release();
+      } else {
+        return Status(kUnknownError, "inspector error: " + response.error);
       }
-      if (response.result) {
-        result->reset(response.result.release());
-        return Status(kOk);
-      }
-      return Status(kUnknownError, "inspector error: " + response.error);
     }
   }
+  result->reset(cmd_response_map_[command_id]);
+  cmd_response_map_.erase(command_id);
+  return Status(kOk);
 }
 
 Status DevToolsClientImpl::ReceiveNextMessage(
     int expected_id,
     internal::InspectorMessageType* type,
     internal::InspectorEvent* event,
     internal::InspectorCommandResponse* response) {
   std::string message;
   if (!socket_->ReceiveNextMessage(&message)) {
     connected_ = false;
     return Status(kDisconnected,
                   "unable to receive message from renderer");
   }
   if (!parser_func_.Run(message, expected_id, type, event, response))
     return Status(kUnknownError, "bad inspector message: " + message);
+  LOG(INFO) << "RECV: " << message;

[craigdh, 2013/01/30 01:44:24]

ditto.

   if (*type == internal::kEventMessageType)
     return NotifyEventListeners(event->method, *event->params);
   return Status(kOk);
 }
 
 Status DevToolsClientImpl::NotifyEventListeners(
     const std::string& method,
     const base::DictionaryValue& params) {
   for (std::list<DevToolsEventListener*>::iterator iter = listeners_.begin();
        iter != listeners_.end(); ++iter) {
@@ skipping 46 matching lines @@
     if (unscoped_result)
       command_response->result.reset(unscoped_result->DeepCopy());
     else
       base::JSONWriter::Write(unscoped_error, &command_response->error);
     return true;
   }
   return false;
 }
 
 }  // namespace internal