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 48 matching lines @@
                           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);
   }
 
   int build_no = 0;
   if (base::StartsWith(browser_string, kVersionPrefix,

[samuong, 2017/03/08 21:24:15]

Can we merge these two if blocks somehow? I'm thinking we could replace the call
to base::StartsWith here with std::string::find. And then check
StartsWith(kHeadlessVersionPrefix) when we set |browser_name|. WDYT?

I'm assuming that both Chrome and HeadlessChrome have the same version scheme,
but if that's not the case then we probably shouldn't do it the way I suggested.

[irisu, 2017/03/08 23:49:34]

Done.

                        base::CompareCase::SENSITIVE)) {
     std::string version = browser_string.substr(kVersionPrefixLen);
 
     Status status = ParseBrowserVersionString(
         version, &browser_info->major_version, &build_no);
     if (status.IsError())
       return status;
 
     if (build_no != 0) {
       browser_info->browser_name = "chrome";
       browser_info->browser_version = version;
       browser_info->build_no = build_no;
       return Status(kOk);
     }
   }
 
+  if (base::StartsWith(browser_string, kHeadlessVersionPrefix,
+                       base::CompareCase::SENSITIVE)) {
+    std::string version = browser_string.substr(kHeadlessVersionPrefixLen);
+
+    Status status = ParseBrowserVersionString(
+        version, &browser_info->major_version, &build_no);
+    if (status.IsError())
+      return status;
+
+    if (build_no != 0) {
+      browser_info->browser_name = "headless 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);
@@ skipping 39 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");
 }