Added enabling WI by command line option

Author: Andrii Moroz

src/chrome/test/webdriver/webdriver_automation.cc

@@ -238,8 +238,11 @@ void Automation::Init(const BrowserOptions& options, int* build_no, Error** erro
     qDebug() << "[WD]: geometry:" << pStartView->geometry();
     if (options.command.HasSwitch(switches::kStartMaximized))
         pStartView->showMaximized();
- 
-    pStartView->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        pStartView->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 
     pStartView->show();
 }
@@ -673,7 +676,10 @@ void Automation::NavigateToURL(const WebViewId &view_id, const std::string &url,
     if (isLoading)
         loop.exec();
 
-    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 }
 
 
@@ -690,7 +696,10 @@ void Automation::NavigateToURLAsync(const WebViewId &view_id, const std::string
     QUrl address(QString(url.c_str()));
     view->load(address);
 
-    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 }
 
 void Automation::GoForward(const WebViewId &view_id, Error **error)
@@ -706,7 +715,10 @@ void Automation::GoForward(const WebViewId &view_id, Error **error)
     QWebHistory *history = view->history();
     history->forward();
 
-    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 }
 
 void Automation::GoBack(const WebViewId &view_id, Error **error)
@@ -722,7 +734,10 @@ void Automation::GoBack(const WebViewId &view_id, Error **error)
     QWebHistory *history = view->history();
     history->back();
 
-    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 }
 
 void Automation::Reload(const WebViewId &view_id, Error **error)
@@ -737,7 +752,10 @@ void Automation::Reload(const WebViewId &view_id, Error **error)
 
     view->reload();
 
-    view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        view->page()->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
 }
 
 void Automation::GetCookies(const WebViewId &view_id, const std::string &url, base::ListValue **cookies, Error **error)

src/chrome/test/webdriver/webdriver_server.cc

@@ -345,6 +345,7 @@ int RunChromeDriver() {
               << "config                            The path to config file (e.g. config.json) in"  << std::endl
               << "                                  JSON format with specified WD parameters as"    << std::endl
               << "                                  described above (port, root, etc.)"             << std::endl
+              << "wi-server      false              If true, web inspector will be enabled"         << std::endl
               << "wi-port        9222               Web inspector listening port"                   << std::endl;
 
      return (EXIT_SUCCESS);
@@ -377,6 +378,11 @@ int RunChromeDriver() {
       std::cout.rdbuf(null_stream.rdbuf());
       qInstallMessageHandler(silentMessageOutput);
   }
+
+  // set WI enabled
+  if (cmd_line->HasSwitch("wi-server")) {
+      SessionManager::GetInstance()->set_wi_enabled(true);
+  }
 #else
   // set default output mode
   qInstallMsgHandler(normalMessageOutput);
@@ -393,6 +399,11 @@ int RunChromeDriver() {
       std::cout.rdbuf(null_stream.rdbuf());
       qInstallMsgHandler(silentMessageOutput);
   }
+
+  // set WI enabled
+  if (cmd_line->HasSwitch("wi-server")) {
+      SessionManager::GetInstance()->set_wi_enabled(true);
+  }
 #endif
 
 //#if defined(OS_POSIX)

src/chrome/test/webdriver/webdriver_session_manager.cc

@@ -46,6 +46,11 @@ void SessionManager::set_wi_port(unsigned int port)
     wi_port_ = port;
 }
 
+void SessionManager::set_wi_enabled(bool isEnabled)
+{
+    isWIEnabled_ = isEnabled;
+}
+
 void SessionManager::set_url_base(const std::string& url_base) {
   url_base_ = url_base;
 }
@@ -63,7 +68,8 @@ std::map<std::string, Session*> SessionManager::GetSessions()
 SessionManager::SessionManager()
     : port_(""),
       url_base_(""),
-      wi_port_(9222)
+      wi_port_(9222),
+      isWIEnabled_(false)
 {}
 
 SessionManager::~SessionManager() {}
@@ -78,4 +84,9 @@ unsigned int SessionManager::get_wi_port() const
     return wi_port_;
 }
 
+bool SessionManager::is_wi_enabled() const
+{
+    return isWIEnabled_;
+}
+
 }  // namespace webdriver

src/chrome/test/webdriver/webdriver_session_manager.h

@@ -34,13 +34,15 @@ class SessionManager {
 
   void set_port(const std::string& port);
   void set_wi_port(unsigned int port);
+  void set_wi_enabled(bool isSupported);
 
   void set_url_base(const std::string& url_base);
   std::string url_base() const;
 
   std::map<std::string, Session*> GetSessions();
 
   unsigned int get_wi_port() const;
+  bool is_wi_enabled() const;
 
  private:
   SessionManager();
@@ -52,6 +54,7 @@ class SessionManager {
   std::string port_;
   std::string url_base_;
   unsigned int wi_port_;
+  bool isWIEnabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionManager);
 };

src/qwebviewext.cc

@@ -9,6 +9,10 @@
 #include <QtGui/QWidget>
 #endif
 
+#include "chrome/test/webdriver/webdriver_session_manager.h"
+
+using namespace webdriver;
+
 QWebViewExt::QWebViewExt(QWidget *parent) :
     QWebView(parent)
 {
@@ -23,7 +27,11 @@ QWebView* QWebViewExt::createWindow(QWebPage::WebWindowType type)
 {
     QWebViewExt* newView = new QWebViewExt;
     newView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-    newView->setProperty("_q_webInspectorServerPort", 9222);
+    if (SessionManager::GetInstance()->is_wi_enabled())
+    {
+        newView->setProperty("_q_webInspectorServerPort", SessionManager::GetInstance()->get_wi_port());
+    }
+
     newView->show();
     newView->setAttribute(Qt::WA_DeleteOnClose, true);
     QVariant sessionId = property("sessionId");