Skip to content

GitLab

T
tangled
Commit b47b8490 authored by John Chen's avatar John Chen Committed by Commit Bot
Browse files
Options

[ChromeDriver] Update mobile device list 

Re-generate ChromeDriver mobile device list to pick up some new devices.

Bug: chromedriver:2207
Change-Id: I14e633b0cc7390b56cdb8d9d7a241aea8803e93d
Reviewed-on: https://chromium-review.googlesource.com/847994Reviewed-by: default avatarJonathon Kereliuk <kereliuk@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526989}
parent f0056530
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 36 deletions
chrome/test/chromedriver/capabilities_unittest.cc
View file @ b47b8490
......@@ -7,6 +7,7 @@
#include <utility>
#include "base/stl_util.h"
#include "base/strings/pattern.h"
#include "base/values.h"
#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/chrome/status.h"
......@@ -530,11 +531,11 @@ TEST(ParseCapabilities, MobileEmulationDeviceName) {
ASSERT_EQ(1u, capabilities.switches.GetSize());
ASSERT_TRUE(capabilities.switches.HasSwitch("user-agent"));
ASSERT_EQ(
ASSERT_TRUE(base::MatchPattern(
capabilities.switches.GetSwitchValue("user-agent"),
"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3227.0 Mobile "
"Safari/537.36",
capabilities.switches.GetSwitchValue("user-agent"));
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/*.*.*.* Mobile "
"Safari/537.36"));
ASSERT_EQ(360, capabilities.device_metrics->width);
ASSERT_EQ(640, capabilities.device_metrics->height);
......
chrome/test/chromedriver/chrome/mobile_device_list.cc
View file @ b47b8490
// Copyright 2017 The Chromium Authors. All rights reserved.
// Copyright 2018 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.
// This file was generated at (2017-09-29 09:51:48.959567) by running:
// This file was generated at (2018-01-03 09:47:36.639726) by running:
// ./chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
// chrome/test/chromedriver/chrome/
// third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json
......@@ -22,20 +22,20 @@ const char kMobileDevices[] =
"Safari/537.10+\"}, \"Nexus 6\": {\"deviceScaleFactor\": 3.5, \"mobile\": "
"true, \"height\": 732, \"width\": 412, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3227.0 Mobile "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3302.0 Mobile "
"Safari/537.36\"}, \"LG Optimus L70\": {\"deviceScaleFactor\": 1.25, "
"\"mobile\": true, \"height\": 640, \"width\": 384, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 "
"Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 "
"Chrome/63.0.3227.0 Mobile Safari/537.36\"}, \"Nexus 4\": "
"Chrome/65.0.3302.0 Mobile Safari/537.36\"}, \"Nexus 4\": "
"{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 640, \"width\": "
"384, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.4.2; "
"Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/63.0.3227.0 Mobile Safari/537.36\"}, \"Nexus 5\": "
"Chrome/65.0.3302.0 Mobile Safari/537.36\"}, \"Nexus 5\": "
"{\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 640, \"width\": "
"360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 6.0; "
"Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/63.0.3227.0 Mobile Safari/537.36\"}, \"Blackberry PlayBook\": "
"Chrome/65.0.3302.0 Mobile Safari/537.36\"}, \"Blackberry PlayBook\": "
"{\"deviceScaleFactor\": 1, \"mobile\": true, \"height\": 1024, \"width\": "
"600, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (PlayBook; U; RIM "
"Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) "
......@@ -47,36 +47,53 @@ const char kMobileDevices[] =
"{\"deviceScaleFactor\": 3.5, \"mobile\": true, \"height\": 732, "
"\"width\": 412, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; "
"Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like "
"Gecko) Chrome/63.0.3227.0 Mobile Safari/537.36\"}, \"Laptop with HiDPI "
"Gecko) Chrome/65.0.3302.0 Mobile Safari/537.36\"}, \"iPhone 8 Plus\": "
"{\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 736, \"width\": "
"414, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS "
"10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) "
"CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1\"}, \"iPhone 7 Plus\": "
"{\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 736, \"width\": "
"414, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS "
"10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) "
"CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1\"}, \"Laptop with HiDPI "
"screen\": {\"deviceScaleFactor\": 2, \"mobile\": false, \"height\": 1440, "
"\"width\": 900, \"touch\": false, \"userAgent\": \"\"}, \"Nexus 7\": "
"{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 960, \"width\": "
"600, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.3; "
"Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/63.0.3227.0 Safari/537.36\"}, \"Nokia N9\": "
"Chrome/65.0.3302.0 Safari/537.36\"}, \"Nokia N9\": "
"{\"deviceScaleFactor\": 1, \"mobile\": true, \"height\": 854, \"width\": "
"480, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (MeeGo; NokiaN9) "
"AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile "
"Safari/534.13\"}, \"Nokia Lumia 520\": {\"deviceScaleFactor\": 1.5, "
"\"mobile\": true, \"height\": 533, \"width\": 320, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; "
"Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)\"}, \"Nexus "
"10\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 1280, "
"\"width\": 800, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; "
"Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like "
"Gecko) Chrome/63.0.3227.0 Safari/537.36\"}, \"Microsoft Lumia 950\": "
"{\"deviceScaleFactor\": 4, \"mobile\": true, \"height\": 640, \"width\": "
"360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Windows Phone 10.0; "
"Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like "
"Gecko) Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/14.14263\"}, \"iPhone "
"5\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 568, "
"\"width\": 320, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; "
"CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) "
"Version/9.0 Mobile/13B143 Safari/601.1\"}, \"iPhone 4\": "
"{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 480, \"width\": "
"320, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS "
"9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 "
"Mobile/13B143 Safari/601.1\"}, \"iPhone 6\": {\"deviceScaleFactor\": 2, "
"Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)\"}, \"iPhone "
"7\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 667, "
"\"width\": 375, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; "
"CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like "
"Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1\"}, \"Microsoft "
"Lumia 950\": {\"deviceScaleFactor\": 4, \"mobile\": true, \"height\": "
"640, \"width\": 360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 "
"(Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile "
"Safari/537.36 Edge/14.14263\"}, \"iPhone 5\": {\"deviceScaleFactor\": 2, "
"\"mobile\": true, \"height\": 568, \"width\": 320, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
"AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
"Safari/601.1\"}, \"iPhone 4\": {\"deviceScaleFactor\": 2, \"mobile\": "
"true, \"height\": 480, \"width\": 320, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
"AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
"Safari/601.1\"}, \"Nexus 10\": {\"deviceScaleFactor\": 2, \"mobile\": "
"true, \"height\": 1280, \"width\": 800, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3302.0 "
"Safari/537.36\"}, \"iPhone 8\": {\"deviceScaleFactor\": 2, \"mobile\": "
"true, \"height\": 667, \"width\": 375, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) "
"AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 "
"Mobile/14E5239e Safari/602.1\"}, \"iPhone 6\": {\"deviceScaleFactor\": 2, "
"\"mobile\": true, \"height\": 667, \"width\": 375, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
"AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
......@@ -99,7 +116,7 @@ const char kMobileDevices[] =
"Safari/601.1\"}, \"Nexus 5X\": {\"deviceScaleFactor\": 2.625, \"mobile\": "
"true, \"height\": 732, \"width\": 412, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3227.0 Mobile "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3302.0 Mobile "
"Safari/537.36\"}, \"Galaxy Note II\": {\"deviceScaleFactor\": 2, "
"\"mobile\": true, \"height\": 640, \"width\": 360, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 "
......@@ -108,10 +125,14 @@ const char kMobileDevices[] =
"\"mobile\": true, \"height\": 736, \"width\": 414, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
"AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
"Safari/601.1\"}, \"Galaxy S5\": {\"deviceScaleFactor\": 3, \"mobile\": "
"true, \"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3227.0 Mobile "
"Safari/601.1\"}, \"iPhone X\": {\"deviceScaleFactor\": 3, \"mobile\": "
"true, \"height\": 812, \"width\": 375, \"touch\": true, \"userAgent\": "
"\"Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) "
"AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 "
"Mobile/14E5239e Safari/602.1\"}, \"Galaxy S5\": {\"deviceScaleFactor\": "
"3, \"mobile\": true, \"height\": 640, \"width\": 360, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) "
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3302.0 Mobile "
"Safari/537.36\"}, \"Kindle Fire HDX\": {\"deviceScaleFactor\": 2, "
"\"mobile\": true, \"height\": 1280, \"width\": 800, \"touch\": true, "
"\"userAgent\": \"Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) "
......
chrome/test/chromedriver/chrome/mobile_device_list.h
View file @ b47b8490
// Copyright 2017 The Chromium Authors. All rights reserved.
// Copyright 2018 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.
// This file was generated at (2017-09-29 09:51:48.959567) by running:
// This file was generated at (2018-01-03 09:47:36.639726) by running:
// ./chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
// chrome/test/chromedriver/chrome/
// third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment