Fix failing Firefox tests

The mind boggles that we used to pass in something thinking it
was JSON that wasn't actually JSON. *sigh*

Author: shs96c

java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java

@@ -366,9 +366,15 @@ public String toJson() throws IOException {
   }
 
   public static FirefoxProfile fromJson(String json) throws IOException {
-    String zippedProfile = new Json().toType(json, String.class);
+    // We used to just pass in the entire string without quotes. If we see that, we're good.
+    // Otherwise, parse the json.
+
+    if (json.trim().startsWith("\"")) {
+      json = new Json().toType(json, String.class);
+    }
+
     return new FirefoxProfile(Zip.unzipToTempDir(
-        zippedProfile,
+        json,
         "webdriver",
         "duplicated"));
   }

java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java

@@ -67,7 +67,7 @@ public void shouldQuoteStringsWhenSettingStringProperties() throws Exception {
   }
 
   @Test
-  public void getStringPreferenceShouldReturnUserSuppliedValueWhenSet() throws Exception {
+  public void getStringPreferenceShouldReturnUserSuppliedValueWhenSet() {
     String key = "cheese";
     String value = "brie";
     profile.setPreference(key, value);
@@ -77,7 +77,7 @@ public void getStringPreferenceShouldReturnUserSuppliedValueWhenSet() throws Exc
   }
 
   @Test
-  public void getStringPreferenceShouldReturnDefaultValueWhenSet() throws Exception {
+  public void getStringPreferenceShouldReturnDefaultValueWhenSet() {
     String key = "cheese";
 
     String defaultValue = "brie";
@@ -92,7 +92,7 @@ public void shouldSetIntegerPreferences() throws Exception {
   }
 
   @Test
-  public void getIntegerPreferenceShouldReturnUserSuppliedValueWhenSet() throws Exception {
+  public void getIntegerPreferenceShouldReturnUserSuppliedValueWhenSet() {
     String key = "cheese";
     int value = 1234;
     profile.setPreference(key, value);
@@ -102,7 +102,7 @@ public void getIntegerPreferenceShouldReturnUserSuppliedValueWhenSet() throws Ex
   }
 
   @Test
-  public void getIntegerPreferenceShouldReturnDefaultValueWhenSet() throws Exception {
+  public void getIntegerPreferenceShouldReturnDefaultValueWhenSet() {
     String key = "cheese";
 
     int defaultValue = 42;
@@ -117,7 +117,7 @@ public void shouldSetBooleanPreferences() throws Exception {
   }
 
   @Test
-  public void getBooleanPreferenceShouldReturnUserSuppliedValueWhenSet() throws Exception {
+  public void getBooleanPreferenceShouldReturnUserSuppliedValueWhenSet() {
     String key = "cheese";
     boolean value = true;
     profile.setPreference(key, value);
@@ -127,7 +127,7 @@ public void getBooleanPreferenceShouldReturnUserSuppliedValueWhenSet() throws Ex
   }
 
   @Test
-  public void getBooleanPreferenceShouldReturnDefaultValueWhenSet() throws Exception {
+  public void getBooleanPreferenceShouldReturnDefaultValueWhenSet() {
     String key = "cheese";
 
     boolean defaultValue = true;
@@ -153,15 +153,15 @@ public void shouldNotResetFrozenPreferences() throws Exception {
   }
 
   @Test
-  public void shouldInstallExtensionFromZip() throws IOException {
+  public void shouldInstallExtensionFromZip() {
     profile.addExtension(InProject.locate(FIREBUG_PATH).toFile());
     File profileDir = profile.layoutOnDisk();
     File extensionDir = new File(profileDir, "extensions/[email protected]");
     assertTrue(extensionDir.exists());
   }
 
   @Test
-  public void shouldInstallWebExtensionFromZip() throws IOException {
+  public void shouldInstallWebExtensionFromZip() {
     profile.addExtension(InProject.locate(MOOLTIPASS_PATH).toFile());
     File profileDir = profile.layoutOnDisk();
     File extensionDir = new File(profileDir, "extensions/[email protected]");
@@ -189,7 +189,7 @@ public void shouldInstallWebExtensionFromDirectory() throws IOException {
   }
 
   @Test
-  public void shouldInstallExtensionUsingClasspath() throws IOException {
+  public void shouldInstallExtensionUsingClasspath() {
     profile.addExtension(SynthesizedFirefoxDriver.class, FIREBUG_RESOURCE_PATH);
     File profileDir = profile.layoutOnDisk();
     File extensionDir = new File(profileDir, "extensions/[email protected]");