[ChromeDriver] Subscribe PerformanceLogger to CommandListener interface

chrome/test/chromedriver/session_commands.cc

 // Copyright (c) 2013 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/session_commands.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 #include "chrome/test/chromedriver/chrome/chrome.h"
 #include "chrome/test/chromedriver/chrome/chrome_android_impl.h"
 #include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h"
 #include "chrome/test/chromedriver/chrome/device_manager.h"
 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
 #include "chrome/test/chromedriver/chrome/geoposition.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/version.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/chrome_launcher.h"
+#include "chrome/test/chromedriver/command_listener.h"
 #include "chrome/test/chromedriver/logging.h"
 #include "chrome/test/chromedriver/net/url_request_context_getter.h"
 #include "chrome/test/chromedriver/session.h"
 #include "chrome/test/chromedriver/util.h"
 #include "chrome/test/chromedriver/version.h"
 
 namespace {
 
 const char kWindowHandlePrefix[] = "CDwindow-";
 
@@ skipping 76 matching lines @@
   if (status.IsError())
     return status;
 
   Log::Level driver_level = Log::kWarning;
   if (capabilities.logging_prefs.count(WebDriverLog::kDriverType))
     driver_level = capabilities.logging_prefs[WebDriverLog::kDriverType];
   session->driver_log->set_min_level(driver_level);
 
   // Create Log's and DevToolsEventListener's for ones that are DevTools-based.
   // Session will own the Log's, Chrome will own the listeners.
+  // Also create CommandListeners for the appropriate logs.
   ScopedVector<DevToolsEventListener> devtools_event_listeners;
+  std::list<CommandListener*> command_listeners;

[stgao, 2014/06/27 16:48:25]

Is it possible to use ScopedVector here and assign it to the one in the Session
object instead of adding one by one?

That will make it easy to ensure there is no leak.

[johnmoore, 2014/06/27 21:58:03]

Done.

   status = CreateLogs(capabilities,
                       &session->devtools_logs,
-                      &devtools_event_listeners);
+                      &devtools_event_listeners, &command_listeners);
   if (status.IsError())
     return status;
 
+  // session will own the CommandListeners after they are added.
+  for (std::list<CommandListener*>::const_iterator it =
+      command_listeners.begin();
+      it != command_listeners.end();
+      ++it) {
+    session->AddListener(*it);
+  }
+
   status = LaunchChrome(bound_params.context_getter.get(),
                         bound_params.socket_factory,
                         bound_params.device_manager,
                         bound_params.port_server,
                         bound_params.port_manager,
                         capabilities,
                         devtools_event_listeners,
                         &session->chrome);
   if (status.IsError())
     return status;
@@ skipping 501 matching lines @@
 Status ExecuteSetAutoReporting(
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   bool enabled;
   if (!params.GetBoolean("enabled", &enabled))
     return Status(kUnknownError, "missing parameter 'enabled'");
   session->auto_reporting_enabled = enabled;
   return Status(kOk);
 }