Removing InternetExplorerDriver constructor that accepts WindowsProxyManager as a parameter. Proxy management moved to IEDriverServer and WindowsProxyManager is used for RC only now

Author: barancev

java/client/src/org/openqa/selenium/browserlaunchers/build.desc

@@ -2,7 +2,6 @@
 java_library(name = "browserlaunchers",
   srcs = [
     "BrowserLauncher.java",
-    "MacProxyManager.java",
   ],
   deps = [
     ":launcher-utils",
@@ -14,38 +13,32 @@ java_library(name = "browserlaunchers",
     "//third_party/java/guava-libraries",
   ])
 
-java_library(name = "proxies",
-  srcs = [
-    "DoNotUseProxyPac.java",
-    "Maps.java",
-    "Proxies.java",
-  ],
-  deps = [
-    "//java/client/src/org/openqa/selenium:base",
-    "//java/client/src/org/openqa/selenium/remote:base",
-  ])
-
-java_library(name = "windows_proxy_manager",
+java_library(name = "launcher-utils",
   srcs = [
-    "WindowsProxyManager.java",
+    "LauncherUtils.java",
+    "MacProxyManager.java",
+    "Sleeper.java",
   ],
   deps = [
     ":proxies",
+    "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/org/openqa/selenium/io",
+    "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/os",
+    "//java/client/src/org/openqa/selenium/remote:base",
+    "//third_party/java/guava-libraries",
   ])
 
-java_library(name = "launcher-utils",
+java_library(name = "proxies",
   srcs = [
-    "LauncherUtils.java",
-    "Sleeper.java",
+    "DoNotUseProxyPac.java",
+    "Maps.java",
+    "Proxies.java",
+    "WindowsProxyManager.java",
   ],
   deps = [
-    ":windows_proxy_manager",
-    "//java/client/src/org/openqa/selenium:webdriver-api",
+    "//java/client/src/org/openqa/selenium:base",
+    "//java/client/src/org/openqa/selenium/remote:base",
     "//java/client/src/org/openqa/selenium/io",
-    "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/os",
-    "//java/client/src/org/openqa/selenium/remote:base",
-    "//third_party/java/guava-libraries",
   ])

java/client/src/org/openqa/selenium/ie/InternetExplorerDriver.java

@@ -17,15 +17,12 @@
 
 package org.openqa.selenium.ie;
 
-import static org.openqa.selenium.remote.CapabilityType.PROXY;
-
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.browserlaunchers.WindowsProxyManager;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.DriverCommand;
@@ -145,38 +142,31 @@ public class InternetExplorerDriver extends RemoteWebDriver {
    */
   private final static int DEFAULT_PORT = 0;
 
-  /**
-   * Proxy manager.
-   */
-  private WindowsProxyManager proxyManager;
-
   public InternetExplorerDriver() {
-    this(null, null, null, DEFAULT_PORT);
+    this(null, null, DEFAULT_PORT);
   }
 
   public InternetExplorerDriver(Capabilities capabilities) {
-    this(null, null, capabilities, DEFAULT_PORT);
+    this(null, capabilities, DEFAULT_PORT);
   }
 
   public InternetExplorerDriver(int port) {
-    this(null, null, null, port);
+    this(null, null, port);
   }
 
   public InternetExplorerDriver(InternetExplorerDriverService service) {
-    this(null, service, null, DEFAULT_PORT);
+    this(service, null, DEFAULT_PORT);
   }
 
   public InternetExplorerDriver(InternetExplorerDriverService service, Capabilities capabilities) {
-    this(null, service, capabilities, DEFAULT_PORT);
+    this(service, capabilities, DEFAULT_PORT);
   }
 
-  public InternetExplorerDriver(WindowsProxyManager proxy, InternetExplorerDriverService service, Capabilities capabilities, int port) {
+  public InternetExplorerDriver(InternetExplorerDriverService service, Capabilities capabilities, int port) {
     if (capabilities == null) {
       capabilities = DesiredCapabilities.internetExplorer();
     }
 
-    proxyManager = proxy;
-
     if (service == null) {
       service = setupService(capabilities, port);
     }
@@ -186,8 +176,6 @@ public InternetExplorerDriver(WindowsProxyManager proxy, InternetExplorerDriverS
   private void run(InternetExplorerDriverService service, Capabilities capabilities) {
     assertOnWindows();
 
-    prepareProxy(capabilities);
-
     setCommandExecutor(new DriverCommandExecutor(service));
 
     startSession(capabilities);
@@ -265,25 +253,4 @@ private InternetExplorerDriverService setupService(Capabilities caps, int port)
       throw Throwables.propagate(ex);
     }
   }
-
-  private void prepareProxy(Capabilities caps) {
-    // do not prepare proxy manager if it will be managed by server.
-    if (caps == null || caps.getCapability(PROXY) == null || proxyManager == null) {
-      return;
-    }
-
-    // Because of the way that the proxying is currently implemented,
-    // we can only set a single host.
-    proxyManager.backupRegistrySettings();
-    proxyManager.changeRegistrySettings(caps);
-
-    Thread cleanupThread = new Thread() { // Thread safety reviewed
-      @Override
-      public void run() {
-        proxyManager.restoreRegistrySettings(true);
-      }
-    };
-    Runtime.getRuntime().addShutdownHook(cleanupThread);
-  }
-
 }

java/client/src/org/openqa/selenium/ie/build.desc

@@ -3,9 +3,7 @@ java_library(name = "ie",
   srcs  = [ "*.java" ],
   deps = [
     "//cpp/iedriverserver:sizzle",
-    "//java/client/src/org/openqa/selenium/browserlaunchers:windows_proxy_manager",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/remote/service",
-    "//third_party/java/jna",
   ])