Add <link rel=preconnect> support to the HTMLPreloadScanner

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"
 #include "core/frame/Settings.h"
 #include "core/html/parser/HTMLParserOptions.h"
 #include "core/html/parser/HTMLResourcePreloader.h"
+#include "core/loader/Preconnecter.h"
 #include "core/testing/DummyPageHolder.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 typedef struct {
     const char* baseURL;
     const char* inputHTML;
     const char* preloadedURL;
     const char* outputBaseURL;
     Resource::Type type;
     int resourceWidth;
     ClientHintsPreferences preferences;
 } TestCase;
 
+typedef struct {
+    const char* baseURL;
+    const char* inputHTML;
+    const char* preconnectedHost;
+    CrossOriginAttributeValue crossOrigin;
+} PreconnectTestCase;
+
+class MockPreconnecter : public PreconnecterHost {

[Mike West, 2015/06/02 11:18:34]

Nit: I'd prefer either `MockPreconnecterHost : public PreconnecterHost` or
`MockPreconnecter : public Preconnecter`.

+public:
+    static PassOwnPtr<PreconnecterHost> createLeavingReference(MockPreconnecter*& preconnector)
+    {
+        preconnector = new MockPreconnecter();
+        return adoptPtr(preconnector);
+    }
+
+    virtual void preconnect(KURL& host, CrossOriginAttributeValue crossOrigin) override
+    {
+        m_host = host;
+        m_crossOrigin = crossOrigin;
+    }
+
+    void init()
+    {
+        m_host = KURL();
+        m_crossOrigin = CrossOriginAttributeNotSet;
+    }
+
+    void verify(String host, CrossOriginAttributeValue crossOrigin)
+    {
+        EXPECT_STREQ(m_host.string().ascii().data(), host.ascii().data());
+        EXPECT_EQ(m_crossOrigin, crossOrigin);
+    }
+
+private:
+

[Mike West, 2015/06/02 11:18:33]

Nit: No newline.

+    KURL m_host;
+    CrossOriginAttributeValue m_crossOrigin;
+};
 class MockHTMLResourcePreloader : public ResourcePreloader {

[Mike West, 2015/06/02 11:18:34]

Nit: Newline.

 public:
     void preloadRequestVerification(Resource::Type type, const String& url, const String& baseURL, int width)
     {
         EXPECT_EQ(m_preloadRequest->resourceType(), type);
         EXPECT_STREQ(m_preloadRequest->resourceURL().ascii().data(),  url.ascii().data());
         EXPECT_STREQ(m_preloadRequest->baseURL().ascii().data(), baseURL.ascii().data());
         EXPECT_EQ(m_preloadRequest->resourceWidth(), width);
     }
 
 protected:
@@ skipping 32 matching lines @@
         data.displayMode = WebDisplayModeBrowser;
         return MediaValuesCached::create(data);
     }
 
     void runSetUp(bool viewportEnabled)
     {
         HTMLParserOptions options(&m_dummyPageHolder->document());
         KURL documentURL(ParsedURLString, "http://whatever.test/");
         m_dummyPageHolder->document().settings()->setViewportEnabled(viewportEnabled);
         m_dummyPageHolder->document().settings()->setViewportMetaEnabled(viewportEnabled);
-        m_scanner = HTMLPreloadScanner::create(options, documentURL, CachedDocumentParameters::create(&m_dummyPageHolder->document(), createMediaValues()));
+        m_scanner = HTMLPreloadScanner::create(options, documentURL, CachedDocumentParameters::create(&m_dummyPageHolder->document(), createMediaValues()), MockPreconnecter::createLeavingReference(m_preconnecter));
     }
 
     virtual void SetUp()
     {
         runSetUp(true);
     }
 
     void test(TestCase testCase)
     {
         MockHTMLResourcePreloader preloader;
         KURL baseURL(ParsedURLString, testCase.baseURL);
         m_scanner->appendToEnd(String(testCase.inputHTML));
         m_scanner->scan(&preloader, baseURL);
 
         preloader.preloadRequestVerification(testCase.type, testCase.preloadedURL, testCase.outputBaseURL, testCase.resourceWidth);
     }
 
+    void test(PreconnectTestCase testCase)
+    {
+        m_preconnecter->init();
+        MockHTMLResourcePreloader preloader;
+        KURL baseURL(ParsedURLString, testCase.baseURL);
+        m_scanner->appendToEnd(String(testCase.inputHTML));
+        m_scanner->scan(&preloader, baseURL);
+        m_preconnecter->verify(testCase.preconnectedHost, testCase.crossOrigin);
+    }
+
 private:
     OwnPtr<DummyPageHolder> m_dummyPageHolder;
     OwnPtr<HTMLPreloadScanner> m_scanner;
+    MockPreconnecter* m_preconnecter;
 };
 
 TEST_F(HTMLPreloadScannerTest, testImages)
 {
     TestCase testCases[] = {
         {"http://example.test", "<img src='bla.gif'>", "bla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<img sizes='50vw' src='bla.gif'>", "bla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 1x'>", "bla2.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 0.5x'>", "bla.gif", "http://example.test/", Resource::Image, 0},
@@ skipping 84 matching lines @@
         {"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},
     };
 
     for (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/", CrossOriginAttributeNotSet},
+        {"http://example.test", "<link rel=preconnect href=http://example2.test crossorigin='use-credentials'>", "http://example2.test/", CrossOriginAttributeNotSet},
+        {"http://example.test", "<link rel=preconnected href=http://example2.test crossorigin='use-credentials'>", "", CrossOriginAttributeNotSet},

[Mike West, 2015/06/02 11:18:34]

Is it intentional that the `crossorigin` attribute is always NotSet? If so,
please add that to the CL description (and add a TODO?)

+    };
+
+    for (auto testCase : testCases)

[Mike West, 2015/06/02 11:18:34]

Nit: `const auto&`

+        test(testCase);
+}
+
 }