Make HasDevTools interface-like to avoid private methods being overriden

0421f53 is not really working because Remote::Driver extends itself
with HasDevTools and the latter overrides
Remote::Driver#devtools_version and Remote::Driver#devtools_url.
Now every class that includes HasDevTools has to explicitly implement
the required methods.

Author: p0deje

rb/lib/selenium/webdriver/chrome/driver.rb

@@ -48,6 +48,17 @@ def execute_cdp(cmd, **params)
 
         private
 
+        def devtools_url
+          uri = URI(devtools_address)
+          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
+
+          JSON.parse(response)['webSocketDebuggerUrl']
+        end
+
+        def devtools_version
+          Integer(capabilities.browser_version.split('.').first)
+        end
+
         def devtools_address
           "http://#{capabilities['goog:chromeOptions']['debuggerAddress']}"
         end

rb/lib/selenium/webdriver/common/driver_extensions/has_devtools.rb

@@ -37,23 +37,6 @@ def devtools
           end
         end
 
-        private
-
-        def devtools_version
-          return Firefox::DEVTOOLS_VERSION if browser == :firefox
-
-          Integer(capabilities.browser_version.split('.').first)
-        end
-
-        def devtools_url
-          return devtools_address if devtools_address.include?('/session/')
-
-          uri = URI(devtools_address)
-          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
-
-          JSON.parse(response)['webSocketDebuggerUrl']
-        end
-
       end # HasDevTools
     end # DriverExtensions
   end # WebDriver

rb/lib/selenium/webdriver/firefox/driver.rb

@@ -40,8 +40,15 @@ def browser
 
         private
 
-        def devtools_address
-          "http://#{capabilities['moz:debuggerAddress']}"
+        def devtools_url
+          uri = URI("http://#{capabilities['moz:debuggerAddress']}")
+          response = Net::HTTP.get(uri.hostname, '/json/version', uri.port)
+
+          JSON.parse(response)['webSocketDebuggerUrl']
+        end
+
+        def devtools_version
+          Firefox::DEVTOOLS_VERSION
         end
       end # Driver
     end # Firefox

rb/lib/selenium/webdriver/remote/driver.rb

@@ -46,7 +46,7 @@ def initialize(bridge: nil, listener: nil, **opts)
 
         private
 
-        def devtools_address
+        def devtools_url
           capabilities['se:cdp']
         end