platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/modules/notifications/NotificationImageLoaderTest.cpp

 // Copyright 2016 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 "modules/notifications/NotificationImageLoader.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "platform/testing/HistogramTester.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/platform/weborigin/KURL.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 namespace {
 
 enum class LoadState { kNotLoaded, kLoadFailed, kLoadSuccessful };
 
-const char kBaseUrl[] = "http://test.com/";
-const char kIcon500x500[] = "500x500.png";
+constexpr char kBaseUrl[] = "http://test.com/";
+constexpr char kBaseDir[] = "notifications/";
+constexpr char kIcon500x500[] = "500x500.png";
 
 // This mirrors the definition in NotificationImageLoader.cpp.
-const unsigned long kImageFetchTimeoutInMs = 90000;
+constexpr unsigned long kImageFetchTimeoutInMs = 90000;
 
 static_assert(kImageFetchTimeoutInMs > 1000.0,
               "kImageFetchTimeoutInMs must be greater than 1000ms.");
 
 class NotificationImageLoaderTest : public ::testing::Test {
  public:
   NotificationImageLoaderTest()
       : m_page(DummyPageHolder::create()),
         // Use an arbitrary type, since it only affects which UMA bucket we use.
         m_loader(
             new NotificationImageLoader(NotificationImageLoader::Type::Icon)) {}
 
   ~NotificationImageLoaderTest() override {
     m_loader->stop();
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     memoryCache()->evictResources();
   }
 
   // Registers a mocked URL. When fetched it will be loaded form the test data
   // directory.
   WebURL registerMockedURL(const String& fileName) {
-    WebURL url(KURL(ParsedURLString, kBaseUrl + fileName));
-    URLTestHelpers::registerMockedURLLoad(url, fileName, "notifications/",
-                                          "image/png");
-    return url;
+    WebURL registeredUrl = URLTestHelpers::registerMockedURLLoadFromBase(
+        kBaseUrl, testing::webTestDataPath(kBaseDir), fileName, "image/png");
+    return registeredUrl;
   }
 
   // Callback for the NotificationImageLoader. This will set the state of the
   // load as either success or failed based on whether the bitmap is empty.
   void imageLoaded(const SkBitmap& bitmap) {
     if (!bitmap.empty())
       m_loaded = LoadState::kLoadSuccessful;
     else
       m_loaded = LoadState::kLoadFailed;
   }
@@ skipping 54 matching lines @@
   EXPECT_EQ(LoadState::kLoadFailed, loaded());
   m_histogramTester.expectTotalCount("Notifications.LoadFinishTime.Icon", 0);
   m_histogramTester.expectTotalCount("Notifications.LoadFileSize.Icon", 0);
   // Should log a non-zero failure time.
   m_histogramTester.expectTotalCount("Notifications.LoadFailTime.Icon", 1);
   m_histogramTester.expectBucketCount("Notifications.LoadFailTime.Icon", 0, 0);
 }
 
 }  // namspace
 }  // namespace blink