Merge 101524 - Don't try to call setDefersLoading when the loader is null. This does a bit of cle...

webkit/plugins/ppapi/ppb_url_loader_impl.h

Index: webkit/plugins/ppapi/ppb_url_loader_impl.h
===================================================================
--- webkit/plugins/ppapi/ppb_url_loader_impl.h	(revision 102278)
+++ webkit/plugins/ppapi/ppb_url_loader_impl.h	(working copy)
@@ -117,6 +117,10 @@
   bool RecordDownloadProgress() const;
   bool RecordUploadProgress() const;
 
+  // Calls SetDefersLoading on the current load. This encapsulates the logic
+  // differences between document loads and regular ones.
+  void SetDefersLoading(bool defers_loading);
+
   void FinishLoading(int32_t done_status);
 
   // If true, then the plugin instance is a full-frame plugin and we're just
@@ -128,7 +132,15 @@
   // change the request info resource out from under us.
   ::ppapi::PPB_URLRequestInfo_Data request_data_;
 
+  // The loader associated with this request. MAY BE NULL.
+  //
+  // This will be NULL if the load hasn't been opened yet, or if this is a main
+  // document loader (when registered as a mime type). Therefore, you should
+  // always NULL check this value before using it. In the case of a main
+  // document load, you would call the functions on the document to cancel the
+  // load, etc. since there is no loader.
   scoped_ptr<WebKit::WebURLLoader> loader_;
+
   scoped_refptr<PPB_URLResponseInfo_Impl> response_info_;
   scoped_refptr<TrackedCompletionCallback> pending_callback_;
   std::deque<char> buffer_;