More regular Platform implementations in unit tests (reland.)

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

 /*
  * Copyright (c) 2014, 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 "config.h"
 
 #include "core/fetch/FetchContext.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourcePtr.h"
 #include "platform/network/ResourceRequest.h"
+#include "platform/testing/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 // An URL for the original request.
 const char kResourceURL[] = "http://resource.com/";
 
 // The origin time of our first request.
 const char kOriginalRequestDateAsString[] = "Thu, 25 May 1977 18:30:00 GMT";
 const double kOriginalRequestDateAsDouble = 233433000.;
 
 const char kOneDayBeforeOriginalRequest[] = "Wed, 24 May 1977 18:30:00 GMT";
 const char kOneDayAfterOriginalRequest[] = "Fri, 26 May 1977 18:30:00 GMT";
 
-const unsigned char kAConstUnsignedCharZero = 0;
-
 class MockFetchContext : public FetchContext {
 public:
     static MockFetchContext* create()
     {
         return new MockFetchContext;
     }
 
     ~MockFetchContext() { }
 
     bool allowImage(bool imagesEnabled, const KURL&) const override { return true; }
@@ skipping 43 matching lines @@
     ResourcePtr<Resource> fetchImage()
     {
         FetchRequest fetchRequest(ResourceRequest(KURL(ParsedURLString, kResourceURL)), FetchInitiatorInfo());
         return ImageResource::fetch(fetchRequest, fetcher());
     }
 
     ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
 private:
     // A simple platform that mocks out the clock, for cache freshness testing.
-    class ProxyPlatform : public blink::Platform {
+    class ProxyPlatform : public TestingPlatformSupport {
     public:
-        ProxyPlatform() : m_platform(blink::Platform::current()), m_elapsedSeconds(0.) { }
-
-        ~ProxyPlatform()
-        {
-            blink::Platform::initialize(m_platform);
-        }
+        ProxyPlatform() : m_elapsedSeconds(0.) { }
 
         void advanceClock(double seconds)
         {
             m_elapsedSeconds += seconds;
         }
 
-        WebThread* currentThread() override
-        {
-            return m_platform->currentThread();
-        }
-
     private:
         // From blink::Platform:
         double currentTimeSeconds() override
         {
             return kOriginalRequestDateAsDouble + m_elapsedSeconds;
         }
 
-        // These blink::Platform methods must be overriden to make a usable object.
-        virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length)
-        {
-            RELEASE_ASSERT_NOT_REACHED();
-        }
-        virtual const unsigned char* getTraceCategoryEnabledFlag(const char* categoryName)
-        {
-            return &kAConstUnsignedCharZero;
-        }
-
-        blink::Platform* m_platform; // Not owned.
         double m_elapsedSeconds;
     };
 
     virtual void SetUp()
     {
-        blink::Platform::initialize(&m_proxyPlatform);
-
         // Save the global memory cache to restore it upon teardown.
         m_globalMemoryCache = replaceMemoryCacheForTesting(MemoryCache::create());
 
         m_fetcher = ResourceFetcher::create(MockFetchContext::create());
     }
 
     virtual void TearDown()
     {
         memoryCache()->evictResources();
 
@@ skipping 400 matching lines @@
     firstResource->setResponse(fresh200Response);
     memoryCache()->add(firstResource.get());
 
     advanceClock(500.);
 
     ResourcePtr<Resource> fetched = fetch();
     EXPECT_EQ(firstResource, fetched);
 }
 
 } // namespace blink