diff options
| author | hartmanng@chromium.org <hartmanng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 17:56:52 +0000 |
|---|---|---|
| committer | hartmanng@chromium.org <hartmanng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 17:56:52 +0000 |
| commit | 45bd8927682e1ad991638755e4233f7e2a9bed16 (patch) | |
| tree | cd5e3a28230b76c11a5c69bf99bf66a157571c8b | |
| parent | 3f74358f279229586461d16a777f62058f46839a (diff) | |
| download | chromium_src-45bd8927682e1ad991638755e4233f7e2a9bed16.zip chromium_src-45bd8927682e1ad991638755e4233f7e2a9bed16.tar.gz chromium_src-45bd8927682e1ad991638755e4233f7e2a9bed16.tar.bz2 | |
[devtools, telemetry] Need to get Chrome version separately from User Agent
BUG=169331
Review URL: https://chromiumcodereview.appspot.com/11819067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179905 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/devtools/devtools_http_handler_impl.cc | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/browser_backend.py | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index e14d683..36506a1 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -517,6 +517,8 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI( WebKit::WebDevToolsAgent::inspectorProtocolVersion()); version.SetString("WebKit-Version", webkit_glue::GetWebKitVersion()); + version.SetString("Browser", + content::GetContentClient()->GetProduct()); version.SetString("User-Agent", webkit_glue::GetUserAgent(GURL(chrome::kAboutBlankURL))); SendJson(connection_id, net::HTTP_OK, &version, "", jsonp); diff --git a/tools/telemetry/telemetry/browser_backend.py b/tools/telemetry/telemetry/browser_backend.py index 9bb6b3a..8b3051f 100644 --- a/tools/telemetry/telemetry/browser_backend.py +++ b/tools/telemetry/telemetry/browser_backend.py @@ -98,12 +98,24 @@ class BrowserBackend(object): resp = json.loads(data) if 'Protocol-Version' in resp: self._inspector_protocol_version = resp['Protocol-Version'] - mU = re.search('Chrome/\d+\.\d+\.(\d+)\.\d+ Safari', resp['User-Agent']) - mW = re.search('\((trunk)?\@(\d+)\)', resp['WebKit-Version']) - if mU: - self._chrome_branch_number = int(mU.group(1)) - if mW: - self._webkit_base_revision = int(mW.group(2)) + if 'Browser' in resp: + branch_number_match = re.search('Chrome/\d+\.\d+\.(\d+)\.\d+', + resp['Browser']) + else: + branch_number_match = re.search('Chrome/\d+\.\d+\.(\d+)\.\d+ Safari', + resp['User-Agent']) + webkit_version_match = re.search('\((trunk)?\@(\d+)\)', + resp['WebKit-Version']) + + if branch_number_match: + self._chrome_branch_number = int(branch_number_match.group(1)) + else: + # Content Shell returns '' for Browser, for now we have to + # fall-back and assume branch 1025. + self._chrome_branch_number = 1025 + + if webkit_version_match: + self._webkit_base_revision = int(webkit_version_match.group(2)) return # Detection has failed: assume 18.0.1025.168 ~= Chrome Android. |