Ensure we set capabilities consistently in *Capabilities

By lifting the logic from `MutableCapabilities` up.

Author: shs96c

java/client/src/org/openqa/selenium/AbstractCapabilities.java

@@ -17,6 +17,9 @@
 
 package org.openqa.selenium;
 
+import org.openqa.selenium.logging.LogLevelMapping;
+import org.openqa.selenium.logging.LoggingPreferences;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -44,6 +47,32 @@ protected void setCapability(String key, Object value) {
       return;
     }
 
+    if ("loggingPrefs".equals(key) && value instanceof Map) {
+      LoggingPreferences prefs = new LoggingPreferences();
+      @SuppressWarnings("unchecked") Map<String, String> prefsMap = (Map<String, String>) value;
+
+      for (String logType : prefsMap.keySet()) {
+        prefs.enable(logType, LogLevelMapping.toLevel(prefsMap.get(logType)));
+      }
+      caps.put(key, prefs);
+      return;
+    }
+
+    if ("platform".equals(key) && value instanceof String) {
+      try {
+        caps.put(key, Platform.fromString((String) value));
+      } catch (WebDriverException e) {
+        caps.put(key, value);
+      }
+      return;
+    }
+
+    if ("unexpectedAlertBehaviour".equals(key)) {
+      caps.put("unexpectedAlertBehaviour", value);
+      caps.put("unhandledPromptBehavior", value);
+      return;
+    }
+
     caps.put(key, value);
   }
 

java/client/src/org/openqa/selenium/MutableCapabilities.java

@@ -18,9 +18,6 @@
 package org.openqa.selenium;
 
 
-import org.openqa.selenium.logging.LogLevelMapping;
-import org.openqa.selenium.logging.LoggingPreferences;
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;
@@ -101,32 +98,6 @@ public void setCapability(String key, Object value) {
       return;
     }
 
-    if ("loggingPrefs".equals(key) && value instanceof Map) {
-      LoggingPreferences prefs = new LoggingPreferences();
-      @SuppressWarnings("unchecked") Map<String, String> prefsMap = (Map<String, String>) value;
-
-      for (String logType : prefsMap.keySet()) {
-        prefs.enable(logType, LogLevelMapping.toLevel(prefsMap.get(logType)));
-      }
-      super.setCapability(key, prefs);
-      return;
-    }
-
-    if ("platform".equals(key) && value instanceof String) {
-      try {
-        super.setCapability(key, Platform.fromString((String) value));
-      } catch (WebDriverException e) {
-        super.setCapability(key, value);
-      }
-      return;
-    }
-
-    if ("unexpectedAlertBehaviour".equals(key)) {
-      super.setCapability("unexpectedAlertBehaviour", value);
-      super.setCapability("unhandledPromptBehavior", value);
-      return;
-    }
-
     super.setCapability(key, value);
   }
 }