Fix Chromedriver Issue 749

chrome/test/chromedriver/chrome/device_manager.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/chrome/device_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 102 matching lines @@
 
   return status;
 }
 
 Status Device::ForwardDevtoolsPort(const std::string& package,
                                    const std::string& process,
                                    int port,
                                    std::string* device_socket) {
   if (device_socket->empty()) {
     // Assume this is a WebView app.
-    int pid;
-    Status status = adb_->GetPidByName(serial_,
+    Status status = adb_->GetDevtoolsRemoteSocket(serial_,
                                        process.empty() ? package : process,
-                                       &pid);
+                                       device_socket);

[samuong, 2016/10/03 18:50:40]

reindent so that all arguments are aligned

[Rahul Kavalapara, 2016/10/05 08:06:42]

Done.

     if (status.IsError()) {
       if (process.empty())
         status.AddDetails(
             "process name must be specified if not equal to package name");
       return status;
     }
-    *device_socket = base::StringPrintf("webview_devtools_remote_%d", pid);
+    // *device_socket = base::StringPrintf("webview_devtools_remote_%d", pid);

[samuong, 2016/10/03 18:50:40]

don't uncomment, just delete this line

[Rahul Kavalapara, 2016/10/05 08:06:42]

Done.

   }
 
   return adb_->ForwardPort(serial_, port, *device_socket);
 }
 
 Status Device::TearDown() {
   if (!active_package_.empty()) {
     std::string response;
     Status status = adb_->ForceStop(serial_, active_package_);
     if (status.IsError())
@@ skipping 62 matching lines @@
 Device* DeviceManager::LockDevice(const std::string& device_serial) {
   active_devices_.push_back(device_serial);
   return new Device(device_serial, adb_,
       base::Bind(&DeviceManager::ReleaseDevice, base::Unretained(this),
                  device_serial));
 }
 
 bool DeviceManager::IsDeviceLocked(const std::string& device_serial) {
   return base::ContainsValue(active_devices_, device_serial);
 }