Generalize ScopedRegisteredURL as ScoedMockedURL*

third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp

Index: third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
index 7c3e7dbd412112bcdf5ff11d458ec1053e1abb21..88461fdff5559ff3b40a8e22a4eb10cc5af487a4 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp
@@ -197,29 +197,10 @@ class ImageResourceTestMockFetchContext : public FetchContext {
   RefPtr<scheduler::FakeWebTaskRunner> m_runner;
 };
 
-// Convenience class that registers a mocked URL load on construction, and
-// unregisters it on destruction. This allows for a test to use constructs like
-// ASSERT_TRUE() without needing to worry about unregistering the mocked URL
-// load to avoid putting other tests into inconsistent states in case the
-// assertion fails.
-// TODO(toyoshim): Generalize and move to platform/testing/URLTestHelpers.
-class ScopedRegisteredURL {
- public:
-  ScopedRegisteredURL(const KURL& url,
-                      const String& fileName = "cancelTest.html",
-                      const String& mimeType = "text/html")
-      : m_url(url) {
-    URLTestHelpers::registerMockedURLLoad(
-        m_url, testing::webTestDataPath(fileName.utf8().data()), mimeType);
-  }
-
-  ~ScopedRegisteredURL() {
-    Platform::current()->getURLLoaderMockFactory()->unregisterURL(m_url);
-  }
-
- private:
-  KURL m_url;
-};
+WebURL registerURLLoad(const KURL& url) {
+  return URLTestHelpers::registerMockedURLLoad(
+      url, testing::webTestDataPath("cancelTest.html"), "text/html");
+}
 
 AtomicString buildContentRange(size_t rangeLength, size_t totalLength) {
   return AtomicString(String("bytes 0-" + String::number(rangeLength) + "/" +
@@ -230,7 +211,7 @@ TEST(ImageResourceTest, MultipartImage) {
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   // Emulate starting a real load, but don't expect any "real"
   // WebURLLoaderClient callbacks.
@@ -309,7 +290,7 @@ TEST(ImageResourceTest, MultipartImage) {
 
 TEST(ImageResourceTest, CancelOnRemoveObserver) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -408,7 +389,7 @@ TEST(ImageResourceTest, UpdateBitmapImages) {
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
   ResourceRequest request = ResourceRequest(testURL);
   request.setPreviewsState(WebURLRequest::ServerLoFiOn);
   ImageResource* imageResource = ImageResource::create(request);
@@ -472,7 +453,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceRequest request(testURL);
   request.setPreviewsState(WebURLRequest::ServerLoFiOn);
@@ -541,7 +522,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderForPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -849,7 +830,7 @@ TEST(ImageResourceTest, AddClientAfterPrune) {
 
 TEST(ImageResourceTest, CancelOnDecodeError) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -877,7 +858,7 @@ TEST(ImageResourceTest, CancelOnDecodeError) {
 
 TEST(ImageResourceTest, DecodeErrorWithEmptyBody) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -907,7 +888,7 @@ TEST(ImageResourceTest, DecodeErrorWithEmptyBody) {
 
 TEST(ImageResourceTest, FetchDisallowPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   FetchRequest request(testURL, FetchInitiatorInfo());
   ImageResource* imageResource = ImageResource::fetch(
@@ -962,7 +943,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderDataURL) {
 
 TEST(ImageResourceTest, FetchAllowPlaceholderPostRequest) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
   ResourceRequest resourceRequest(testURL);
   resourceRequest.setHTTPMethod("POST");
   FetchRequest request(resourceRequest, FetchInitiatorInfo());
@@ -981,7 +962,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderPostRequest) {
 
 TEST(ImageResourceTest, FetchAllowPlaceholderExistingRangeHeader) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
   ResourceRequest resourceRequest(testURL);
   resourceRequest.setHTTPHeaderField("range", "bytes=128-255");
   FetchRequest request(resourceRequest, FetchInitiatorInfo());
@@ -1000,7 +981,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderExistingRangeHeader) {
 
 TEST(ImageResourceTest, FetchAllowPlaceholderSuccessful) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   FetchRequest request(testURL, FetchInitiatorInfo());
   request.setAllowImagePlaceholder();
@@ -1049,7 +1030,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderSuccessful) {
 
 TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   FetchRequest request(testURL, FetchInitiatorInfo());
   request.setAllowImagePlaceholder();
@@ -1110,7 +1091,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
 
 TEST(ImageResourceTest, FetchAllowPlaceholderThenDisallowPlaceholder) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -1140,7 +1121,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderThenDisallowPlaceholder) {
 TEST(ImageResourceTest,
      FetchAllowPlaceholderThenDisallowPlaceholderAfterLoaded) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
@@ -1193,7 +1174,7 @@ TEST(ImageResourceTest, PeriodicFlushTest) {
   ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
       platform;
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  ScopedRegisteredURL scopedRegisteredURL(testURL);
+  ScopedMockedURL scopedMockedURL(registerURLLoad(testURL));
   ResourceRequest request = ResourceRequest(testURL);
   ImageResource* imageResource = ImageResource::create(request);
   imageResource->setStatus(ResourceStatus::Pending);