Split RW hint into Width and Viewport-Width

Source/core/html/parser/HTMLPreloadScannerTest.cpp

 // Copyright 2015 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 "config.h"
 #include "core/html/parser/HTMLPreloadScanner.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/fetch/ClientHintsPreferences.h"
@@ skipping 192 matching lines @@
         {"http://example.test", "<meta name=viewport content=sdkbsdkjnejjha><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
     };
 
     for (const auto& testCase : testCases)
         test(testCase);
 }
 
 TEST_F(HTMLPreloadScannerTest, testMetaAcceptCH)
 {
     ClientHintsPreferences dpr;
-    ClientHintsPreferences rw;
-    ClientHintsPreferences dprAndRw;
+    ClientHintsPreferences resourceWidth;
+    ClientHintsPreferences all;
+    ClientHintsPreferences viewportWidth;
     dpr.setShouldSendDPR(true);
-    dprAndRw.setShouldSendDPR(true);
-    rw.setShouldSendRW(true);
-    dprAndRw.setShouldSendRW(true);
+    all.setShouldSendDPR(true);
+    resourceWidth.setShouldSendResourceWidth(true);
+    all.setShouldSendResourceWidth(true);
+    viewportWidth.setShouldSendViewportWidth(true);
     TestCase testCases[] = {
         {"http://example.test", "<meta http-equiv='accept-ch' content='bla'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch' content='dprw'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch' content='dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, dpr},
         {"http://example.test", "<meta http-equiv='accept-ch' content='bla,dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, dpr},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  rw  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, rw},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  rw  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, rw},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  rw  , wutever, dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, dprAndRw},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  ,width, wutever, dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, all},
     };
 
     for (const auto& testCase : testCases)
         test(testCase);
 }
 
 TEST_F(HTMLPreloadScannerTest, testPreconnect)
 {
     PreconnectTestCase testCases[] = {
         {"http://example.test", "<link rel=preconnect href=http://example2.test>", "http://example2.test", CrossOriginAttributeNotSet},
         {"http://example.test", "<link rel=preconnect href=http://example2.test crossorigin=anonymous>", "http://example2.test", CrossOriginAttributeAnonymous},
         {"http://example.test", "<link rel=preconnect href=http://example2.test crossorigin='use-credentials'>", "http://example2.test", CrossOriginAttributeUseCredentials},
         {"http://example.test", "<link rel=preconnected href=http://example2.test crossorigin='use-credentials'>", nullptr, CrossOriginAttributeNotSet},
         {"http://example.test", "<link rel=preconnect href=ws://example2.test crossorigin='use-credentials'>", nullptr, CrossOriginAttributeNotSet},
     };
 
     for (const auto& testCase : testCases)
         test(testCase);
 }
 
 } // namespace blink