make sure to start chromedrivers with reference to the correct adb se…

…rver port

lib/commands/context.js

@@ -107,7 +107,8 @@ helpers.startChromedriverProxy = async function (context) {
   } else {
     let opts = _.cloneDeep(this.opts);
     opts.chromeUseRunningApp = true;
-    cd = await setupNewChromedriver(opts, this.adb.curDeviceId);
+    cd = await setupNewChromedriver(opts, this.adb.curDeviceId,
+                                    this.adb.getAdbServerPort());
     // bind our stop/exit handler, passing in context so we know which
     // one stopped unexpectedly
     cd.on(Chromedriver.EVENT_CHANGED, (msg) => {
@@ -186,10 +187,11 @@ async function setupExistingChromedriver (chromedriver) {
   return chromedriver;
 }
 
-async function setupNewChromedriver (opts, curDeviceId) {
+async function setupNewChromedriver (opts, curDeviceId, adbPort) {
   let chromeArgs = {
     port: opts.chromeDriverPort,
-    executable: opts.chromedriverExecutable
+    executable: opts.chromedriverExecutable,
+    adbPort
   };
   let chromedriver = new Chromedriver(chromeArgs);
   let caps = {

lib/driver.js

@@ -191,7 +191,8 @@ class AndroidDriver extends BaseDriver {
     if (!_.contains(knownPackages, this.opts.appPackage)) {
       opts.chromeAndroidActivity = this.opts.appActivity;
     }
-    this.chromedriver = await setupNewChromedriver(opts, this.adb.curDeviceId);
+    this.chromedriver = await setupNewChromedriver(opts, this.adb.curDeviceId,
+                                                   this.adb.getAdbServerPort());
     this.chromedriver.on(Chromedriver.EVENT_CHANGED, (msg) => {
       if (msg.state === Chromedriver.STATE_STOPPED) {
         this.onChromedriverStop(CHROMIUM_WIN);

package.json

@@ -33,7 +33,7 @@
     "appium-android-bootstrap": "^2.1.5",
     "appium-android-ime": "^2.0.0",
     "appium-base-driver": "^0.4.1",
-    "appium-chromedriver": "^2.3.0",
+    "appium-chromedriver": "^2.3.3",
     "appium-express": "^0.0.5",
     "appium-logger": "^1.1.7",
     "appium-support": "2.0.0-beta21",