Verify the order of RawResourceClient callbacks in DocumentThreadableLoader

third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * 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.
@@ skipping 133 matching lines @@
         // |this| may be dead after calling this method.
         void handleError(const ResourceError&);
 
         void loadRequest(const ResourceRequest&, ResourceLoaderOptions);
         bool isAllowedRedirect(const KURL&) const;
         // Returns DoNotAllowStoredCredentials
         // if m_forceDoNotAllowStoredCredentials is set. Otherwise, just
         // returns allowCredentials value of m_resourceLoaderOptions.
         StoredCredentials effectiveAllowCredentials() const;
 
-        // TODO(oilpan): DocumentThreadableLoader used to be a ResourceOwner,
-        // but ResourceOwner was moved onto the oilpan heap before
-        // DocumentThreadableLoader was ready. When DocumentThreadableLoader
-        // moves onto the oilpan heap, make it a ResourceOwner again and remove
-        // this re-implementation of ResourceOwner.
+        // TODO(hiroshige): After crbug.com/633696 is fixed,
+        // - Remove RawResourceClientStateChecker logic,
+        // - Make DocumentThreadableLoader to be a ResourceOwner and remove
+        //   this re-implementation of ResourceOwner, and
+        // - Consider re-applying RawResourceClientStateChecker in a more
+        //   general fashion (crbug.com/640291).
         RawResource* resource() const { return m_resource.get(); }
         void clearResource() { setResource(nullptr); }
         void setResource(RawResource* newResource)
         {
             if (newResource == m_resource)
                 return;
 
-            if (RawResource* oldResource = m_resource.release())
+            if (RawResource* oldResource = m_resource.release()) {
+                m_checker.willRemoveClient();
                 oldResource->removeClient(this);
+            }
 
             if (newResource) {
                 m_resource = newResource;
+                m_checker.willAddClient();
                 m_resource->addClient(this);
             }
         }
         Member<RawResource> m_resource;
         // End of ResourceOwner re-implementation, see above.
 
         const SecurityOrigin* getSecurityOrigin() const;
         Document& document() const;
 
         ThreadableLoaderClient* m_client;
@@ skipping 45 matching lines @@
         int m_corsRedirectLimit;
 
         WebURLRequest::FetchRedirectMode m_redirectMode;
 
         // Holds the referrer after a redirect response was
         // received. This referrer is used to populate the HTTP Referer
         // header when following the redirect.
         bool m_didRedirect;
         Referrer m_referrerAfterRedirect;
 
+        RawResourceClientStateChecker m_checker;
         WeakPtrFactory<DocumentThreadableLoader> m_weakFactory;
     };
 
 } // namespace blink
 
 #endif // DocumentThreadableLoader_h