Render process changes for ResourceTiming sizes.

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "core/fetch/ResourceFetcher.h"
 
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/heap/Handle.h"
+#include "platform/heap/HeapAllocator.h"
+#include "platform/heap/Member.h"
 #include "platform/network/ResourceRequest.h"
+#include "platform/network/ResourceTimingInfo.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/weburl_loader_mock.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLResponse.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "wtf/Allocator.h"
 #include "wtf/PtrUtil.h"
+#include "wtf/Vector.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
+const char testImageFilename[] = "white-1x1.png";
+const int testImageSize = 103; // size of web/tests/data/white-1x1.png
+
 class MockTaskRunner : public blink::WebTaskRunner {
     void postTask(const WebTraceLocation&, Task*) override { }
     void postDelayedTask(const WebTraceLocation&, Task*, double) override { }
     WebTaskRunner* clone() override { return nullptr; }
     double virtualTimeSeconds() const override { return 0.0; }
     double monotonicallyIncreasingVirtualTimeSeconds() const override { return 0.0; }
 };
 
 }
 
 class ResourceFetcherTestMockFetchContext : public FetchContext {
 public:
     static ResourceFetcherTestMockFetchContext* create()
     {
         return new ResourceFetcherTestMockFetchContext;
     }
 
     virtual ~ResourceFetcherTestMockFetchContext() { }
 
     bool allowImage(bool imagesEnabled, const KURL&) const override { return true; }
     bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const override { return true; }
     bool shouldLoadNewResource(Resource::Type) const override { return true; }
     WebTaskRunner* loadingTaskRunner() const override { return m_runner.get(); }
 
     void setCachePolicy(CachePolicy policy) { m_policy = policy; }
     CachePolicy getCachePolicy() const override { return m_policy; }
     void setLoadComplete(bool complete) { m_complete = complete; }
     bool isLoadComplete() const override { return m_complete; }
 
+    void addResourceTiming(const ResourceTimingInfo& resourceTimingInfo) override { m_transferSize = resourceTimingInfo.transferSize(); }
+    long long getTransferSize() const { return m_transferSize; }
+
 private:
     ResourceFetcherTestMockFetchContext()
         : m_policy(CachePolicyVerify)
         , m_runner(wrapUnique(new MockTaskRunner))
         , m_complete(false)
+        , m_transferSize(-1)
     { }
 
     CachePolicy m_policy;
     std::unique_ptr<MockTaskRunner> m_runner;
     bool m_complete;
+    long long m_transferSize;
 };
 
 class ResourceFetcherTest : public ::testing::Test {
 };
 
 class TestResourceFactory : public ResourceFactory {
 public:
     TestResourceFactory(Resource::Type type = Resource::Raw)
         : ResourceFactory(type) { }
 
@@ skipping 93 matching lines @@
 TEST_F(ResourceFetcherTest, VaryImage)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
     response.setHTTPHeaderField(HTTPNames::Vary, "*");
-    URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png", WebString::fromUTF8(""), WrappedResourceResponse(response));
+    URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, testImageFilename, WebString::fromUTF8(""), WrappedResourceResponse(response));
 
     FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequestOriginal, TestResourceFactory(Resource::Image));
     ASSERT_TRUE(resource);
     Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     ASSERT_TRUE(resource->hasVaryHeader());
 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource, newResource);
@@ skipping 153 matching lines @@
 // This emulates a modal dialog triggering a nested run loop inside
 // ResourceLoader::cancel(). If the ResourceLoader doesn't promptly cancel its
 // WebURLLoader before notifying its clients, a nested run loop  may send a
 // network response, leading to an invalid state transition in ResourceLoader.
 TEST_F(ResourceFetcherTest, ResponseOnCancel)
 {
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
-    URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png", WebString::fromUTF8(""), WrappedResourceResponse(response));
+    URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, testImageFilename, WebString::fromUTF8(""), WrappedResourceResponse(response));
 
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
     Persistent<ServeRequestsOnCompleteClient> client = new ServeRequestsOnCompleteClient();
     resource->addClient(client);
     resource->loader()->cancel();
     resource->removeClient(client);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
+class ScopedMockRedirectRequester {
+    STACK_ALLOCATED();
+    WTF_MAKE_NONCOPYABLE(ScopedMockRedirectRequester);
+
+public:
+    ScopedMockRedirectRequester()
+        : m_context(nullptr)
+    {
+    }
+
+    ~ScopedMockRedirectRequester()
+    {
+        cleanUp();
+    }
+
+    void registerRedirect(const WebString& fromURL, const WebString& toURL)
+    {
+        KURL redirectURL(ParsedURLString, fromURL);
+        WebURLResponse redirectResponse;
+        redirectResponse.initialize();
+        redirectResponse.setURL(redirectURL);
+        redirectResponse.setHTTPStatusCode(301);
+        redirectResponse.setHTTPHeaderField(HTTPNames::Location, toURL);
+        Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, redirectResponse, "");
+        m_registeredURLs.append(redirectURL);
+    }
+
+    void registerFinalResource(const WebString& url)
+    {
+        KURL finalURL(ParsedURLString, url);
+        WebURLResponse finalResponse;
+        finalResponse.initialize();
+        finalResponse.setURL(finalURL);
+        finalResponse.setHTTPStatusCode(200);
+        URLTestHelpers::registerMockedURLLoadWithCustomResponse(finalURL, testImageFilename, "", finalResponse);
+        m_registeredURLs.append(finalURL);
+    }
+
+    void request(const WebString& url)
+    {
+        DCHECK(!m_context);
+        m_context = ResourceFetcherTestMockFetchContext::create();
+        ResourceFetcher* fetcher = ResourceFetcher::create(m_context);
+        FetchRequest fetchRequest = FetchRequest(ResourceRequest(url), FetchInitiatorInfo());
+        Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
+        m_cachedResources.append(resource);
+        Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
+    }
+
+    void cleanUp()
+    {
+        for (const KURL& url : m_registeredURLs) {
+            Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
+        }

[kinuko, 2016/07/07 05:11:40]

You can likely use
Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs() ?

[Adam Rice, 2016/07/07 07:40:01]

That is better, thank you.

+        m_registeredURLs.clear();
+        for (const auto& resource : m_cachedResources) {
+            memoryCache()->remove(resource);
+        }
+        m_cachedResources.clear();

[kinuko, 2016/07/07 05:11:40]

and memoryCache()->evictResources()

[Adam Rice, 2016/07/07 07:40:01]

Thanks, done.

+    }
+
+    ResourceFetcherTestMockFetchContext* context() const { return m_context; }
+
+private:
+    Vector<KURL> m_registeredURLs;
+    HeapVector<Member<Resource>> m_cachedResources;
+    Member<ResourceFetcherTestMockFetchContext> m_context;
+};
+
+TEST_F(ResourceFetcherTest, SameOriginRedirect)
+{
+    const char redirectURL[] = "http://127.0.0.1:8000/redirect.html";
+    const char finalURL[] = "http://127.0.0.1:8000/final.html";
+    ScopedMockRedirectRequester requester;
+    requester.registerRedirect(redirectURL, finalURL);
+    requester.registerFinalResource(finalURL);
+    requester.request(redirectURL);
+
+    EXPECT_EQ(kRedirectResponseOverheadBytes + testImageSize, requester.context()->getTransferSize());
+}
+
+TEST_F(ResourceFetcherTest, CrossOriginRedirect)
+{
+    const char redirectURL[] = "http://otherorigin.test/redirect.html";
+    const char finalURL[] = "http://127.0.0.1:8000/final.html";
+    ScopedMockRedirectRequester requester;
+    requester.registerRedirect(redirectURL, finalURL);
+    requester.registerFinalResource(finalURL);
+    requester.request(redirectURL);
+
+    EXPECT_EQ(testImageSize, requester.context()->getTransferSize());
+}
+
+TEST_F(ResourceFetcherTest, ComplexCrossOriginRedirect)
+{
+    const char redirectURL1[] = "http://127.0.0.1:8000/redirect1.html";
+    const char redirectURL2[] = "http://otherorigin.test/redirect2.html";
+    const char redirectURL3[] = "http://127.0.0.1:8000/redirect3.html";
+    const char finalURL[] = "http://127.0.0.1:8000/final.html";
+    ScopedMockRedirectRequester requester;
+    requester.registerRedirect(redirectURL1, redirectURL2);
+    requester.registerRedirect(redirectURL2, redirectURL3);
+    requester.registerRedirect(redirectURL3, finalURL);
+    requester.registerFinalResource(finalURL);
+    requester.request(redirectURL1);
+
+    EXPECT_EQ(testImageSize, requester.context()->getTransferSize());
+}
+
 } // namespace blink