[ChromeDriver] Add support for attaching multiple DevToolsEventListeners to a DevToolsClient.

chrome/test/chromedriver/devtools_client_impl_unittest.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 <list>
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
@@ skipping 60 matching lines @@
 template <typename T>
 scoped_ptr<SyncWebSocket> CreateMockSyncWebSocket() {
   return scoped_ptr<SyncWebSocket>(new T());
 }
 
 }  // namespace
 
 TEST(DevToolsClientImpl, SendCommand) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<MockSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL);
+  DevToolsClientImpl client(factory, "http://url");
   base::DictionaryValue params;
   params.SetInteger("param", 1);
   ASSERT_EQ(kOk, client.SendCommand("method", params).code());
 }
 
 TEST(DevToolsClientImpl, SendCommandAndGetResult) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<MockSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL);
+  DevToolsClientImpl client(factory, "http://url");
   base::DictionaryValue params;
   params.SetInteger("param", 1);
   scoped_ptr<base::DictionaryValue> result;
   Status status = client.SendCommandAndGetResult("method", params, &result);
   ASSERT_EQ(kOk, status.code());
   std::string json;
   base::JSONWriter::Write(result.get(), &json);
   ASSERT_STREQ("{\"param\":1}", json.c_str());
 }
 
@@ skipping 17 matching lines @@
     EXPECT_TRUE(false);
     return false;
   }
 };
 
 }  // namespace
 
 TEST(DevToolsClientImpl, SendCommandConnectFails) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<MockSyncWebSocket2>);
-  DevToolsClientImpl client(factory, "http://url", NULL);
+  DevToolsClientImpl client(factory, "http://url");
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 namespace {
 
 class MockSyncWebSocket3 : public SyncWebSocket {
  public:
   MockSyncWebSocket3() {}
   virtual ~MockSyncWebSocket3() {}
@@ skipping 10 matching lines @@
     EXPECT_TRUE(false);
     return false;
   }
 };
 
 }  // namespace
 
 TEST(DevToolsClientImpl, SendCommandSendFails) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<MockSyncWebSocket3>);
-  DevToolsClientImpl client(factory, "http://url", NULL);
+  DevToolsClientImpl client(factory, "http://url");
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 namespace {
 
 class MockSyncWebSocket4 : public SyncWebSocket {
  public:
   MockSyncWebSocket4() {}
   virtual ~MockSyncWebSocket4() {}
 
   virtual bool Connect(const GURL& url) OVERRIDE {
     return true;
   }
 
   virtual bool Send(const std::string& message) OVERRIDE {
     return true;
   }
 
   virtual bool ReceiveNextMessage(std::string* message) OVERRIDE {
     return false;
   }
 };
 
 }  // namespace
 
 TEST(DevToolsClientImpl, SendCommandReceiveNextMessageFails) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<MockSyncWebSocket4>);
-  DevToolsClientImpl client(factory, "http://url", NULL);
+  DevToolsClientImpl client(factory, "http://url");
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 namespace {
 
 class FakeSyncWebSocket : public SyncWebSocket {
  public:
   FakeSyncWebSocket() : connected_(false) {}
   virtual ~FakeSyncWebSocket() {}
@@ skipping 104 matching lines @@
   }
   *first = false;
   return true;
 }
 
 }  // namespace
 
 TEST(DevToolsClientImpl, SendCommandOnlyConnectsOnce) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<FakeSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL, base::Bind(
+  DevToolsClientImpl client(factory, "http://url", base::Bind(
       &ReturnCommand));
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsOk());
   ASSERT_TRUE(client.SendCommand("method", params).IsOk());
 }
 
 TEST(DevToolsClientImpl, SendCommandBadResponse) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<FakeSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL, base::Bind(
+  DevToolsClientImpl client(factory, "http://url", base::Bind(
       &ReturnBadResponse));
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 TEST(DevToolsClientImpl, SendCommandBadId) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<FakeSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL, base::Bind(
+  DevToolsClientImpl client(factory, "http://url", base::Bind(
       &ReturnCommandBadId));
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 TEST(DevToolsClientImpl, SendCommandResponseError) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<FakeSyncWebSocket>);
-  DevToolsClientImpl client(factory, "http://url", NULL, base::Bind(
+  DevToolsClientImpl client(factory, "http://url", base::Bind(
       &ReturnCommandError));
   base::DictionaryValue params;
   ASSERT_TRUE(client.SendCommand("method", params).IsError());
 }
 
 TEST(DevToolsClientImpl, SendCommandEventBeforeResponse) {
   SyncWebSocketFactory factory =
       base::Bind(&CreateMockSyncWebSocket<FakeSyncWebSocket>);
   MockListener listener;
   bool first = true;
-  DevToolsClientImpl client(factory, "http://url", &listener, base::Bind(
+  DevToolsClientImpl client(factory, "http://url", base::Bind(
       &ReturnEventThenResponse, &first));
+  client.AddListener(&listener);
   base::DictionaryValue params;
   scoped_ptr<base::DictionaryValue> result;
   ASSERT_TRUE(client.SendCommandAndGetResult("method", params, &result).IsOk());
   ASSERT_TRUE(result);
   int key;
   ASSERT_TRUE(result->GetInteger("key", &key));
   ASSERT_EQ(2, key);
 }
 
 TEST(ParseInspectorMessage, NonJson) {
@@ skipping 63 matching lines @@
   internal::InspectorCommandResponse response;
   ASSERT_TRUE(internal::ParseInspectorMessage(
       "{\"id\":1,\"result\":{\"key\":1}}", 0, &type, &event, &response));
   ASSERT_EQ(internal::kCommandResponseMessageType, type);
   ASSERT_EQ(1, response.id);
   ASSERT_FALSE(response.error.length());
   int key;
   ASSERT_TRUE(response.result->GetInteger("key", &key));
   ASSERT_EQ(1, key);
 }