Use W3C check from parent object instead of assuming from capabilities

Author: AutomatedTester

py/selenium/webdriver/firefox/webdriver.py

@@ -104,7 +104,6 @@ def __init__(self, firefox_profile=None, firefox_binary=None,
         self.binary = None
         self.profile = None
         self.service = None
-        self._w3c = False
 
         if capabilities is None:
             capabilities = DesiredCapabilities.FIREFOX.copy()
@@ -138,8 +137,7 @@ def __init__(self, firefox_profile=None, firefox_binary=None,
         # TODO(ato): Perform conformance negotiation
 
         if capabilities.get("marionette"):
-            self._w3c = True
-
+            capabilities.pop("marionette")
             self.service = Service(executable_path, log_path=log_path)
             self.service.start()
 
@@ -186,7 +184,7 @@ def quit(self):
             # the socket.
             pass
 
-        if self._w3c:
+        if self.w3c:
             self.service.stop()
         else:
             self.binary.kill()