Add headless chrome as an accepted browser string in chromedriver.

chrome/test/chromedriver/chrome/browser_info.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/browser_info.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/json/json_reader.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 
 namespace {
 
 const char kVersionPrefix[] = "Chrome/";
 const size_t kVersionPrefixLen = sizeof(kVersionPrefix) - 1;
 
+const char kHeadlessVersionPrefix[] = "HeadlessChrome/";
+const size_t kHeadlessVersionPrefixLen = sizeof(kHeadlessVersionPrefix) - 1;
+
 }  // namespace
 
 BrowserInfo::BrowserInfo()
     : major_version(0),
       build_no(kToTBuildNo),
       blink_revision(kToTBlinkRevision),
       is_android(false) {
 }
 
 BrowserInfo::BrowserInfo(std::string android_package,
@@ skipping 47 matching lines @@
                           const std::string& browser_string,
                           BrowserInfo* browser_info) {
   if (has_android_package)
     browser_info->is_android = true;
 
   if (browser_string.empty()) {
     browser_info->browser_name = "content shell";
     return Status(kOk);
   }
 
+  const Status error =
+      Status(kUnknownError, "unrecognized Chrome version: " + browser_string);
+
   int build_no = 0;
   if (base::StartsWith(browser_string, kVersionPrefix,
+                       base::CompareCase::SENSITIVE) ||
+      base::StartsWith(browser_string, kHeadlessVersionPrefix,
                        base::CompareCase::SENSITIVE)) {
     std::string version = browser_string.substr(kVersionPrefixLen);
+    bool headless = false;
+    if (base::StartsWith(browser_string, kHeadlessVersionPrefix,
+                         base::CompareCase::SENSITIVE)) {
+      version = browser_string.substr(kHeadlessVersionPrefixLen);
+      headless = true;
+    }
 
     Status status = ParseBrowserVersionString(
         version, &browser_info->major_version, &build_no);
     if (status.IsError())
       return status;
 
     if (build_no != 0) {
-      browser_info->browser_name = "chrome";
+      if (headless)
+        browser_info->browser_name = "headless chrome";
+      else
+        browser_info->browser_name = "chrome";
       browser_info->browser_version = version;
       browser_info->build_no = build_no;
       return Status(kOk);
     }
   }
 
   if (browser_string.find("Version/") == 0u ||   // KitKat
       (has_android_package && build_no == 0)) {  // Lollipop
     size_t pos = browser_string.find(kVersionPrefix);
     if (pos != std::string::npos) {
       browser_info->browser_name = "webview";
       browser_info->browser_version =
           browser_string.substr(pos + kVersionPrefixLen);
       browser_info->is_android = true;
       return ParseBrowserVersionString(browser_info->browser_version,
                                        &browser_info->major_version, &build_no);
     }
     return Status(kOk);
   }
 
-  return Status(kUnknownError,
-                "unrecognized Chrome version: " + browser_string);
+  return error;
 }
 
 Status ParseBrowserVersionString(const std::string& browser_version,
                                  int* major_version, int* build_no) {
   std::vector<base::StringPiece> version_parts = base::SplitStringPiece(
       browser_version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (version_parts.size() != 4 ||
       !base::StringToInt(version_parts[0], major_version) ||
       !base::StringToInt(version_parts[2], build_no)) {
     return Status(kUnknownError,
@@ skipping 23 matching lines @@
   return Status(kOk);
 }
 
 bool IsGitHash(const std::string& revision) {
   const int kShortGitHashLength = 7;
   const int kFullGitHashLength = 40;
   return kShortGitHashLength <= revision.size()
       && revision.size() <= kFullGitHashLength
       && base::ContainsOnlyChars(revision, "0123456789abcdefABCDEF");
 }