[chromedriver] Change browser info parser to support Lollipop WebView apps

chrome/test/chromedriver/chrome/browser_info_unittest.cc

Index: chrome/test/chromedriver/chrome/browser_info_unittest.cc
diff --git a/chrome/test/chromedriver/chrome/browser_info_unittest.cc b/chrome/test/chromedriver/chrome/browser_info_unittest.cc
index 6d91b77eaa49fbf1282ed4678b4f5d9191cb7712..a8872edf5e53afa42fbef5372aa8958884a92a6b 100644
--- a/chrome/test/chromedriver/chrome/browser_info_unittest.cc
+++ b/chrome/test/chromedriver/chrome/browser_info_unittest.cc
@@ -54,16 +54,44 @@ TEST(ParseBrowserInfo, BlinkVersionContainsGitHash) {
   ASSERT_EQ(default_blink_revision, browser_info.blink_revision);
 }
 
-TEST(ParseBrowserString, Chrome) {
-  std::string browser_name;
-  std::string browser_version;
-  int build_no;
+TEST(ParseBrowserString, KitKatWebView) {
+  BrowserInfo browser_info;
+  Status status = ParseBrowserString(
+      false, "Version/4.0 Chrome/30.0.0.0", &browser_info);
+  ASSERT_TRUE(status.IsOk());
+  ASSERT_EQ("webview", browser_info.browser_name);
+  ASSERT_EQ(std::string(), browser_info.browser_version);
+  ASSERT_EQ(kToTBuildNo, browser_info.build_no);
+}
+
+TEST(ParseBrowserString, LollipopWebView) {
+  BrowserInfo browser_info;
+  Status status = ParseBrowserString(
+      true, "Chrome/37.0.0.0", &browser_info);
+  ASSERT_TRUE(status.IsOk());
+  ASSERT_EQ("webview", browser_info.browser_name);
+  ASSERT_EQ(std::string(), browser_info.browser_version);
+  ASSERT_EQ(kToTBuildNo, browser_info.build_no);
+}
+
+TEST(ParseBrowserString, AndroidChrome) {
+  BrowserInfo browser_info;
   Status status = ParseBrowserString(
-      "Chrome/37.0.2062.124", &browser_name, &browser_version, &build_no);
+      true, "Chrome/39.0.2171.59", &browser_info);
   ASSERT_TRUE(status.IsOk());
-  ASSERT_EQ("chrome", browser_name);
-  ASSERT_EQ("37.0.2062.124", browser_version);
-  ASSERT_EQ(2062, build_no);
+  ASSERT_EQ("chrome", browser_info.browser_name);
+  ASSERT_EQ("39.0.2171.59", browser_info.browser_version);
+  ASSERT_EQ(2171, browser_info.build_no);
+}
+
+TEST(ParseBrowserString, DesktopChrome) {
+  BrowserInfo browser_info;
+  Status status = ParseBrowserString(
+      false, "Chrome/39.0.2171.59", &browser_info);
+  ASSERT_TRUE(status.IsOk());
+  ASSERT_EQ("chrome", browser_info.browser_name);
+  ASSERT_EQ("39.0.2171.59", browser_info.browser_version);
+  ASSERT_EQ(2171, browser_info.build_no);
 }
 
 TEST(ParseBlinkVersionString, GitHash) {