[ChromeDriver] Added CommandListener interface

chrome/test/chromedriver/session.h

 // 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.
 
 #ifndef CHROME_TEST_CHROMEDRIVER_SESSION_H_
 #define CHROME_TEST_CHROMEDRIVER_SESSION_H_
 
 #include <list>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "chrome/test/chromedriver/basic_types.h"
 #include "chrome/test/chromedriver/chrome/device_metrics.h"
 #include "chrome/test/chromedriver/chrome/geoposition.h"
+#include "chrome/test/chromedriver/command_listener.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 class Chrome;
 class Status;
 class WebDriverLog;
 class WebView;
 
 struct FrameInfo {
   FrameInfo(const std::string& parent_frame_id,
             const std::string& frame_id,
             const std::string& chromedriver_frame_id);
 
   std::string parent_frame_id;
   std::string frame_id;
   std::string chromedriver_frame_id;
 };
 
-struct Session {
+struct Session : public CommandListener {

[stgao, 2014/06/15 23:54:40]

Composite pattern might not be good here.
We'd better keep Session as close to a plain object as possible.
How about removing the inheritance of CommandListener here?
You could move logic in Session::OnCommand to
ExecuteSessionCommandOnSessionThread or chrome/test/chromedriver/util.cc/h

   static const base::TimeDelta kDefaultPageLoadTimeout;
 
   explicit Session(const std::string& id);
   Session(const std::string& id, scoped_ptr<Chrome> chrome);
   ~Session();
 
   Status GetTargetWindow(WebView** web_view);
+  virtual Status OnCommand(const std::string& command_name) OVERRIDE;
 
   void SwitchToTopFrame();
   void SwitchToParentFrame();
   void SwitchToSubFrame(const std::string& frame_id,
                         const std::string& chromedriver_frame_id);
+  void AddListener(CommandListener* listener);
   std::string GetCurrentFrameId() const;
   std::vector<WebDriverLog*> GetAllLogs() const;
   std::string GetFirstBrowserError() const;
 
   const std::string id;
   bool quit;
   bool detach;
   bool force_devtools_screenshot;
   scoped_ptr<Chrome> chrome;
   std::string window;
   int sticky_modifiers;
   // List of |FrameInfo|s for each frame to the current target frame from the
   // first frame element in the root document. If target frame is window.top,
   // this list will be empty.
   std::list<FrameInfo> frames;
   WebPoint mouse_position;
   base::TimeDelta implicit_wait;
   base::TimeDelta page_load_timeout;
   base::TimeDelta script_timeout;
   scoped_ptr<std::string> prompt_text;
   scoped_ptr<Geoposition> overridden_geoposition;
   scoped_ptr<DeviceMetrics> overridden_device_metrics;
   // Logs that populate from DevTools events.
   ScopedVector<WebDriverLog> devtools_logs;
   scoped_ptr<WebDriverLog> driver_log;
   base::ScopedTempDir temp_dir;
   scoped_ptr<base::DictionaryValue> capabilities;
   bool auto_reporting_enabled;
+  ScopedVector<CommandListener> command_listeners_;
 };
 
 Session* GetThreadLocalSession();
 
 void SetThreadLocalSession(scoped_ptr<Session> session);
 
 #endif  // CHROME_TEST_CHROMEDRIVER_SESSION_H_