Generalize ScopedRegisteredURL as ScoedMockedURL*

third_party/WebKit/Source/platform/testing/URLTestHelpers.cpp

 /*
  * Copyright (C) 2012 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 44 matching lines @@
 
   // filePath = basePath + ("/" +) fileName.
   base::FilePath filePath =
       WebStringToFilePath(basePath).Append(WebStringToFilePath(fileName));
 
   KURL url = toKURL(fullURL);
   registerMockedURLLoad(url, FilePathToWebString(filePath), mimeType);
   return WebURL(url);
 }
 
-void registerMockedURLLoad(const WebURL& fullURL,
-                           const WebString& filePath,
-                           const WebString& mimeType) {
+WebURL registerMockedURLLoad(const WebURL& fullURL,
+                             const WebString& filePath,
+                             const WebString& mimeType) {
   WebURLLoadTiming timing;
   timing.initialize();
 
   WebURLResponse response(fullURL);
   response.setMIMEType(mimeType);
   response.setHTTPStatusCode(200);
   response.setLoadTiming(timing);
 
   registerMockedURLLoadWithCustomResponse(fullURL, filePath, response);
+  return fullURL;
 }
 
-void registerMockedErrorURLLoad(const WebURL& fullURL) {
+WebURL registerMockedErrorURLLoad(const WebURL& fullURL) {
   WebURLLoadTiming timing;
   timing.initialize();
 
   WebURLResponse response;
   response.setMIMEType("image/png");
   response.setHTTPStatusCode(404);
   response.setLoadTiming(timing);
 
   WebURLError error;
   error.reason = 404;
   Platform::current()->getURLLoaderMockFactory()->registerErrorURL(
       fullURL, response, error);
+  return fullURL;
 }
 
-void registerMockedURLLoadWithCustomResponse(const WebURL& fullURL,
-                                             const WebString& filePath,
-                                             WebURLResponse response) {
+WebURL registerMockedURLLoadWithCustomResponse(const WebURL& fullURL,
+                                               const WebString& filePath,
+                                               WebURLResponse response) {
   Platform::current()->getURLLoaderMockFactory()->registerURL(fullURL, response,
                                                               filePath);
+  return fullURL;
 }
 
 }  // namespace URLTestHelpers
+
+ScopedMockedURL::ScopedMockedURL(const WebURL& url) : m_url(url) {}
+
+ScopedMockedURL::~ScopedMockedURL() {
+  Platform::current()->getURLLoaderMockFactory()->unregisterURL(m_url);
+}
+
 }  // namespace blink