Moving Proxies utility class to server

Author: barancev

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/BUCK

@@ -1,7 +1,6 @@
 java_library(name = 'proxies',
   srcs = [
     'DoNotUseProxyPac.java',
-    'Proxies.java',
   ],
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/build.desc

@@ -2,7 +2,6 @@
 java_library(name = "proxies",
   srcs = [
     "DoNotUseProxyPac.java",
-    "Proxies.java",
   ],
   deps = [
     "//java/client/src/org/openqa/selenium:base",

Diff for: java/client/test/org/openqa/selenium/ProxyTest.java

@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Proxy.ProxyType;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/BrowserOptions.java

@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxChromeLauncher.java

@@ -19,7 +19,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.os.CommandLine;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/FirefoxCustomProfileLauncher.java

@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.os.CommandLine;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/KonquerorLauncher.java

@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/LauncherUtils.java

@@ -21,7 +21,6 @@
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.net.Urls;
 

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/OperaCustomProfileLauncher.java

@@ -18,7 +18,6 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.os.WindowsUtils;
 import org.openqa.selenium.server.RemoteControlConfiguration;

Diff for: java/client/src/org/openqa/selenium/browserlaunchers/Proxies.java renamed to java/server/src/org/openqa/selenium/server/browserlaunchers/Proxies.java

@@ -15,7 +15,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.remote.CapabilityType.ForSeleniumServer.AVOIDING_PROXY;
@@ -25,6 +25,7 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.browserlaunchers.DoNotUseProxyPac;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.CapabilityType.ForSeleniumServer;
 import org.openqa.selenium.remote.DesiredCapabilities;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/ProxyInjectionFirefoxCustomProfileLauncher.java

@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.browserlaunchers.locators.BrowserInstallation;
 import org.openqa.selenium.browserlaunchers.locators.FirefoxLocator;
 import org.openqa.selenium.server.ApplicationRegistry;

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/ProxyInjectionInternetExplorerCustomProxyLauncher.java

@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 /**

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/ProxyInjectionSafariCustomProfileLauncher.java

@@ -19,7 +19,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.server.RemoteControlConfiguration;
 
 

Diff for: java/server/src/org/openqa/selenium/server/browserlaunchers/WindowsProxyManager.java

@@ -17,7 +17,6 @@
 package org.openqa.selenium.server.browserlaunchers;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.os.CommandLine;

Diff for: java/server/test/org/openqa/selenium/server/browserlaunchers/BrowserConfigurationOptionsTest.java

@@ -28,7 +28,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 public class BrowserConfigurationOptionsTest {

Diff for: java/server/test/org/openqa/selenium/server/browserlaunchers/LauncherUtilsUnitTest.java

@@ -22,7 +22,6 @@
 import com.google.common.io.Files;
 
 import org.junit.Test;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;

Diff for: java/server/test/org/openqa/selenium/server/browserlaunchers/MakeProxyPacUnitTest.java

@@ -26,7 +26,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 import org.openqa.selenium.io.FileHandler;
 
 import java.io.File;

Diff for: java/server/test/org/openqa/selenium/server/browserlaunchers/ProxyUtilsTest.java

@@ -20,7 +20,6 @@
 
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.browserlaunchers.Proxies;
 
 public class ProxyUtilsTest {
   @Test