[java] Restoring ability to add chrome extension from base64-encoded …

…string. Fixes #5183

java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -46,6 +46,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 /**
  * Class to manage options specific to {@link ChromeDriver}.
@@ -287,15 +288,17 @@ public Map<String, Object> asMap() {
 
     options.put(
         "extensions",
-        extensionFiles.stream()
-            .map(file -> {
-              try {
-                return Base64.getEncoder().encodeToString(Files.toByteArray(file));
-              } catch (IOException e) {
-                throw new SessionNotCreatedException(e.getMessage(), e);
-              }
-            })
-            .collect(ImmutableList.toImmutableList()));
+        Stream.concat(
+            extensionFiles.stream()
+                .map(file -> {
+                  try {
+                    return Base64.getEncoder().encodeToString(Files.toByteArray(file));
+                  } catch (IOException e) {
+                    throw new SessionNotCreatedException(e.getMessage(), e);
+                  }
+                }),
+            extensions.stream()
+        ).collect(ImmutableList.toImmutableList()));
 
     toReturn.put(CAPABILITY, options);
 

java/client/test/org/openqa/selenium/chrome/ChromeOptionsFunctionalTest.java

@@ -18,16 +18,30 @@
 package org.openqa.selenium.chrome;
 
 import static org.junit.Assert.assertEquals;
+import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
+
+import com.google.common.io.Files;
 
 import org.junit.After;
 import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.openqa.selenium.testing.InProject;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.NeedsLocalEnvironment;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Base64;
+
 /**
  * Functional tests for {@link ChromeOptions}.
  */
 public class ChromeOptionsFunctionalTest extends JUnit4TestBase {
+
+  private static final String EXT_PATH = "third_party/chrome_ext/backspace.crx";
+
   private ChromeDriver driver = null;
 
   @After
@@ -59,4 +73,38 @@ public void optionsStayEqualAfterSerialization() throws Exception {
     assertEquals("empty chrome options after one is .toJson() should be equal",
                options1, options2);
   }
+
+  @NeedsLocalEnvironment
+  @Test
+  public void canAddExtensionFromFile() {
+    ChromeOptions options = new ChromeOptions();
+    options.addExtensions(InProject.locate(EXT_PATH).toFile());
+    driver = new ChromeDriver(options);
+
+    driver.get(pages.clicksPage);
+
+    driver.findElement(By.id("normal")).click();
+    new WebDriverWait(driver, 10).until(titleIs("XHTML Test Page"));
+
+    driver.findElement(By.tagName("body")).sendKeys(Keys.BACK_SPACE);
+    new WebDriverWait(driver, 10).until(titleIs("clicks"));
+  }
+
+  @NeedsLocalEnvironment
+  @Test
+  public void canAddExtensionFromStringEncodedInBase64() throws IOException {
+    ChromeOptions options = new ChromeOptions();
+    options.addEncodedExtensions(Base64.getEncoder().encodeToString(
+        Files.toByteArray(InProject.locate(EXT_PATH).toFile())));
+    driver = new ChromeDriver(options);
+
+    driver.get(pages.clicksPage);
+
+    driver.findElement(By.id("normal")).click();
+    new WebDriverWait(driver, 10).until(titleIs("XHTML Test Page"));
+
+    driver.findElement(By.tagName("body")).sendKeys(Keys.BACK_SPACE);
+    new WebDriverWait(driver, 10).until(titleIs("clicks"));
+  }
+
 }