Merge pull request #162 from vania-pooh/master

Supporting latest Chrome versions in devtools

selenium/chrome/devtools/devtools.go

@@ -118,31 +118,36 @@ func getPageWebSocketUrl(targetId string) (*url.URL, error) {
 }
 
 func detectDevtoolsHost(baseDir string) string {
-	candidates, err := filepath.Glob(filepath.Join(baseDir, ".org.chromium.Chromium*"))
-	if err == nil {
-		for _, c := range candidates {
-			f, err := os.Stat(c)
-			if err != nil {
-				continue
-			}
-			if !f.IsDir() {
-				continue
-			}
-			portFile := filepath.Join(c, "DevToolsActivePort")
-			data, err := ioutil.ReadFile(portFile)
-			if err != nil {
-				continue
-			}
-			lines := strings.Split(string(data), "\n")
-			if len(lines) == 0 {
-				continue
-			}
-			port, err := strconv.Atoi(lines[0])
-			if err != nil {
-				continue
-			}
-			return fmt.Sprintf("127.0.0.1:%d", port)
+	var candidates []string
+	for _, glob := range []string{".com.google.Chrome*", ".org.chromium.Chromium*"} {
+		cds, err := filepath.Glob(filepath.Join(baseDir, glob))
+		if err == nil {
+			candidates = append(candidates, cds...)
+		}
+
+	}
+	for _, c := range candidates {
+		f, err := os.Stat(c)
+		if err != nil {
+			continue
+		}
+		if !f.IsDir() {
+			continue
+		}
+		portFile := filepath.Join(c, "DevToolsActivePort")
+		data, err := ioutil.ReadFile(portFile)
+		if err != nil {
+			continue
+		}
+		lines := strings.Split(string(data), "\n")
+		if len(lines) == 0 {
+			continue
+		}
+		port, err := strconv.Atoi(lines[0])
+		if err != nil {
+			continue
 		}
+		return fmt.Sprintf("127.0.0.1:%d", port)
 	}
 	return devtoolsHost
 }