[chromedriver] Send all OnConnected before any OnEvent when connected.

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/logging.h"
@@ skipping 108 matching lines @@
 }
 
 Status DevToolsClientImpl::SendCommandInternal(
     const std::string& method,
     const base::DictionaryValue& params,
     scoped_ptr<base::DictionaryValue>* result) {
   if (!connected_) {
     if (!socket_->Connect(url_))
       return Status(kDisconnected, "unable to connect to renderer");
     connected_ = true;
-    for (std::list<DevToolsEventListener*>::iterator iter = listeners_.begin();
-         iter != listeners_.end(); ++iter) {
-      Status status = (*iter)->OnConnected();
-      if (status.IsError())
-        return status;
-    }
+
+    // OnConnected notification will be sent out in method ReceiveNextMessage.
+    listeners_for_on_connected_ = listeners_;
   }
 
   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);
   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;
   cmd_response_map_[command_id] = NULL;
-  while (cmd_response_map_[command_id] == NULL) {
+  while (!HasReceivedCommandResponse(command_id)) {
     Status status = ReceiveNextMessage(command_id, &type, &event, &response);
     if (status.IsError())
       return status;
   }
   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) {
+  while (!listeners_for_on_connected_.empty()) {
+    DevToolsEventListener* listener = listeners_for_on_connected_.front();
+    listeners_for_on_connected_.pop_front();
+    Status status = listener->OnConnected();
+    if (status.IsError())
+      return status;
+  }
+  // The message might be received already when processing other commands sent
+  // from DevToolsEventListener::OnConnected.
+  if (HasReceivedCommandResponse(expected_id))
+    return Status(kOk);
+
   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);
   if (*type == internal::kEventMessageType)
     return NotifyEventListeners(event->method, *event->params);
   if (*type == internal::kCommandResponseMessageType) {
     if (cmd_response_map_.count(response->id) == 0) {
       return Status(kUnknownError, "unexpected command message");
     } else if (response->result) {
       cmd_response_map_[response->id] = response->result.release();
     } else {
       cmd_response_map_.erase(response->id);
       return ParseInspectorError(response->error);
     }
   }
   return Status(kOk);
 }
 
+bool DevToolsClientImpl::HasReceivedCommandResponse(int cmd_id) {
+  return cmd_response_map_.find(cmd_id) != cmd_response_map_.end()
+      && cmd_response_map_[cmd_id] != NULL;
+}
+
 Status DevToolsClientImpl::NotifyEventListeners(
     const std::string& method,
     const base::DictionaryValue& params) {
   for (std::list<DevToolsEventListener*>::iterator iter = listeners_.begin();
        iter != listeners_.end(); ++iter) {
     (*iter)->OnEvent(method, params);
   }
   if (method == "Inspector.detached") {
     connected_ = false;
     return Status(kDisconnected, "received Inspector.detached event");
@@ skipping 41 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