Generalize ScopedRegisteredURL as ScoedMockedURL*

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

Index: third_party/WebKit/Source/platform/testing/URLTestHelpers.h
diff --git a/third_party/WebKit/Source/platform/testing/URLTestHelpers.h b/third_party/WebKit/Source/platform/testing/URLTestHelpers.h
index 6cb59d353972b5338307f2817da604118c3add9a..7cb2e494d33db138ea00849d8c2d5e4a22557f98 100644
--- a/third_party/WebKit/Source/platform/testing/URLTestHelpers.h
+++ b/third_party/WebKit/Source/platform/testing/URLTestHelpers.h
@@ -62,18 +62,32 @@ WebURL registerMockedURLLoadFromBase(
     const WebString& mimeType = WebString::fromUTF8("text/html"));
 
 // Registers from a full URL and a full file path.
-void registerMockedURLLoad(
+WebURL registerMockedURLLoad(
     const WebURL& fullURL,
     const WebString& filePath,
     const WebString& mimeType = WebString::fromUTF8("text/html"));
-void registerMockedURLLoadWithCustomResponse(const WebURL& fullURL,
-                                             const WebString& filePath,
-                                             WebURLResponse);
+WebURL registerMockedURLLoadWithCustomResponse(const WebURL& fullURL,
+                                               const WebString& filePath,
+                                               WebURLResponse);
 
 // Registers a mock URL that returns a 404 error.
-void registerMockedErrorURLLoad(const WebURL& fullURL);
+WebURL registerMockedErrorURLLoad(const WebURL& fullURL);

[kinuko, 2017/02/07 11:17:38]

To me making these methods return the given fullURL doesn't feel very
intuitive... could we make the scoped class work without doing so?

[Takashi Toyoshima, 2017/02/08 06:47:20]

Done.

 
 }  // namespace URLTestHelpers
+
+// Convenience class that takes a mocked URL and unregisters it on destruction.
+// This allows for a test to use constructs like ASSERT_TRUE() without needing
+// to worry abount unregistering the mocked URL load to avoid putting other
+// tests into inconsistent states in case the assertion fails.
+class ScopedMockedURL {
+ public:
+  explicit ScopedMockedURL(const WebURL&);
+  ~ScopedMockedURL();
+
+ private:
+  WebURL m_url;
+};
+
 }  // namespace blink
 
 #endif