Introduce RevalidationStartForbiddenScope

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

Index: third_party/WebKit/Source/core/fetch/RawResource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/RawResource.cpp b/third_party/WebKit/Source/core/fetch/RawResource.cpp
index 210ed2286218413d0f1908b8d423df6a00689b93..ecc96ed07e3619c41a7aa4449f386b3d0785badc 100644
--- a/third_party/WebKit/Source/core/fetch/RawResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/RawResource.cpp
@@ -130,28 +130,27 @@ void RawResource::appendData(const char* data, size_t length) {
 }
 
 void RawResource::didAddClient(ResourceClient* c) {
-  // CHECK()s for isCacheValidator() are for https://crbug.com/640960#c24.
+  // CHECK()/RevalidationStartForbiddenScope are for
+  // https://crbug.com/640960#c24.
   CHECK(!isCacheValidator());
   if (!hasClient(c))
     return;
   DCHECK(RawResourceClient::isExpectedType(c));
+  RevalidationStartForbiddenScope revalidationStartForbiddenScope(this);
   RawResourceClient* client = static_cast<RawResourceClient*>(c);
   for (const auto& redirect : redirectChain()) {
     ResourceRequest request(redirect.m_request);
     client->redirectReceived(this, request, redirect.m_redirectResponse);
-    CHECK(!isCacheValidator());
     if (!hasClient(c))
       return;
   }
 
   if (!response().isNull())
     client->responseReceived(this, response(), nullptr);
-  CHECK(!isCacheValidator());
   if (!hasClient(c))
     return;
   if (data())
     client->dataReceived(this, data()->data(), data()->size());
-  CHECK(!isCacheValidator());
   if (!hasClient(c))
     return;
   Resource::didAddClient(client);