Consider CriOS to be chrome-like, meaning that we need also

accept:image/webp to send webp. Fixes #1256
apache · Jan 28, 2016 · 23947d0 · 23947d0 · HansVanEijsden · Jan 28, 2016
1 parent aa4ec14
commit 23947d0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/net/instaweb/rewriter/device_properties_test.cc b/net/instaweb/rewriter/device_properties_test.cc
@@ -85,6 +85,12 @@ TEST_F(DevicePropertiesTest, NoWebpForChromeWithoutAcceptHeader) {
   EXPECT_FALSE(device_properties_.SupportsWebpRewrittenUrls());
   EXPECT_FALSE(device_properties_.SupportsWebpLosslessAlpha());
 
+  device_properties_.SetUserAgent(
+      UserAgentMatcherTestBase::kCriOS48UserAgent);
+  EXPECT_FALSE(device_properties_.SupportsWebpInPlace());
+  EXPECT_FALSE(device_properties_.SupportsWebpRewrittenUrls());
+  EXPECT_FALSE(device_properties_.SupportsWebpLosslessAlpha());
+
   // However, Chrome 25 and 37 will get webp due to the accept header.
   RequestHeaders headers;
   headers.Add(HttpAttributes::kAccept, "image/webp");
@@ -100,6 +106,12 @@ TEST_F(DevicePropertiesTest, NoWebpForChromeWithoutAcceptHeader) {
   EXPECT_TRUE(device_properties_.SupportsWebpInPlace());
   EXPECT_TRUE(device_properties_.SupportsWebpRewrittenUrls());
   EXPECT_FALSE(device_properties_.SupportsWebpLosslessAlpha());
+
+  device_properties_.SetUserAgent(
+      UserAgentMatcherTestBase::kCriOS48UserAgent);
+  EXPECT_TRUE(device_properties_.SupportsWebpInPlace());
+  EXPECT_TRUE(device_properties_.SupportsWebpRewrittenUrls());
+  EXPECT_TRUE(device_properties_.SupportsWebpLosslessAlpha());
 }
 
 TEST_F(DevicePropertiesTest, WebpUserAgentIdentificationAccept) {

diff --git a/pagespeed/kernel/http/user_agent_matcher.cc b/pagespeed/kernel/http/user_agent_matcher.cc
@@ -616,7 +616,9 @@ bool UserAgentMatcher::IsiOSUserAgent(const StringPiece& user_agent) const {
 }
 
 bool UserAgentMatcher::IsChromeLike(const StringPiece& user_agent) const {
-  return user_agent.find("Chrome/") != StringPiece::npos;
+  return
+      (user_agent.find("Chrome/") != StringPiece::npos) ||
+      (user_agent.find("CriOS/") != StringPiece::npos);
 }
 
 bool UserAgentMatcher::GetChromeBuildNumber(const StringPiece& user_agent,

diff --git a/pagespeed/kernel/http/user_agent_matcher_test_base.cc b/pagespeed/kernel/http/user_agent_matcher_test_base.cc
@@ -99,6 +99,10 @@ const char UserAgentMatcherTestBase::kCriOS32UserAgent[] =
     "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0_4 like Mac OS X) "
     "AppleWebKit/537.51.1 (KHTML, like Gecko) CriOS/32.0.1700.21 "
     "Mobile/11B554a Safari/9537.53 (A7BED55D-B09E-484F-B2FE-5E4952E9B87E)";
+const char UserAgentMatcherTestBase::kCriOS48UserAgent[] =
+    "Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) "
+    "AppleWebKit/601.1 (KHTML, like Gecko) CriOS/48.0.2564.87 "
+    "Mobile/13C75 Safari/601.1.46";
 const char UserAgentMatcherTestBase::kDoCoMoMobileUserAgent[] =
     "DoCoMo/1.0/D505iS/c20/TB/W20H10";
 const char UserAgentMatcherTestBase::kFirefox1UserAgent[] =

diff --git a/pagespeed/kernel/http/user_agent_matcher_test_base.h b/pagespeed/kernel/http/user_agent_matcher_test_base.h
@@ -55,6 +55,7 @@ class UserAgentMatcherTestBase : public testing::Test {
   static const char kCompalUserAgent[];
   static const char kCriOS31UserAgent[];
   static const char kCriOS32UserAgent[];
+  static const char kCriOS48UserAgent[];
   static const char kDoCoMoMobileUserAgent[];
   static const char kFirefox1UserAgent[];
   static const char kFirefox3UserAgent[];