Remove cancelWithError() from 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 92 matching lines @@
                         std::unique_ptr<WebDataConsumerHandle>) override;
   void setSerializedCachedMetadata(Resource*, const char*, size_t) override;
   void dataReceived(Resource*, const char* data, size_t dataLength) override;
   bool redirectReceived(Resource*,
                         const ResourceRequest&,
                         const ResourceResponse&) override;
   void redirectBlocked() override;
   void dataDownloaded(Resource*, int) override;
   void didReceiveResourceTiming(Resource*, const ResourceTimingInfo&) override;
 
   void cancelWithError(const ResourceError&);

[yhirano, 2016/12/12 08:46:55]

Please remove this declaration.

[tyoshino (SeeGerritForStatus), 2016/12/12 15:42:10]

Done.

 
   // Notify Inspector and log to console about resource response. Use this
   // method if response is not going to be finished normally.
   void reportResponseReceived(unsigned long identifier,
                               const ResourceResponse&);
 
   // Methods containing code to handle resource fetch results which are common
   // to both sync and async mode.
   void handleResponse(unsigned long identifier,
                       const ResourceResponse&,
@@ skipping 11 matching lines @@
   void loadFallbackRequestForServiceWorker();
   // Loads m_actualRequest.
   void loadActualRequest();
   // Clears m_actualRequest and reports access control check failure to
   // m_client.
   void handlePreflightFailure(const String& url,
                               const String& errorDescription);
   // Investigates the response for the preflight request. If successful,
   // the actual request will be made later in handleSuccessfulFinish().
   void handlePreflightResponse(const ResourceResponse&);
-  void handleError(const ResourceError&);
+
+  void dispatchDidFailAccessControlCheck(const ResourceError&);
+  void dispatchDidFail(const ResourceError&);
 
   void loadRequestAsync(const ResourceRequest&, ResourceLoaderOptions);
   void loadRequestSync(const ResourceRequest&, ResourceLoaderOptions);
 
   void prepareCrossOriginRequest(ResourceRequest&);
   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.
@@ skipping 80 matching lines @@
   // used to populate the HTTP Referer header when following the redirect.
   bool m_overrideReferrer;
   Referrer m_referrerAfterRedirect;
 
   RawResourceClientStateChecker m_checker;
 };
 
 }  // namespace blink
 
 #endif  // DocumentThreadableLoader_h