Revert 232802 "[Net] Assert that URLRequests with LOAD_IGNORE_LI..."

trunk/src/net/url_request/url_request.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_H_
 #define NET_URL_REQUEST_URL_REQUEST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 532 matching lines @@
   // Returns the HTTP response code (e.g., 200, 404, and so on).  This method
   // may only be called once the delegate's OnResponseStarted method has been
   // called.  For non-HTTP requests, this method returns -1.
   int GetResponseCode() const;
 
   // Get the HTTP response info in its entirety.
   const HttpResponseInfo& response_info() const { return response_info_; }
 
   // Access the LOAD_* flags modifying this request (see load_flags.h).
   int load_flags() const { return load_flags_; }
-
-  // The new flags may change the IGNORE_LIMITS flag only when called
-  // before Start() is called, it must only set the flag, and if set,
-  // the priority of this request must already be MAXIMUM_PRIORITY.
-  void SetLoadFlags(int flags);
+  void set_load_flags(int flags) { load_flags_ = flags; }
 
   // Returns true if the request is "pending" (i.e., if Start() has been called,
   // and the response has not yet been called).
   bool is_pending() const { return is_pending_; }
 
   // Returns true if the request is in the process of redirecting to a new
   // URL but has not yet initiated the new request.
   bool is_redirecting() const { return is_redirecting_; }
 
   // Returns the error status of the request.
@@ skipping 80 matching lines @@
   const URLRequestContext* context() const;
 
   const BoundNetLog& net_log() const { return net_log_; }
 
   // Returns the expected content size if available
   int64 GetExpectedContentSize() const;
 
   // Returns the priority level for this request.
   RequestPriority priority() const { return priority_; }
 
-  // Sets the priority level for this request and any related
-  // jobs. Must not change the priority to anything other than
-  // MAXIMUM_PRIORITY if the IGNORE_LIMITS load flag is set.
+  // Sets the priority level for this request and any related jobs.
   void SetPriority(RequestPriority priority);
 
   // Returns true iff this request would be internally redirected to HTTPS
   // due to HSTS. If so, |redirect_url| is rewritten to the new HTTPS URL.
   bool GetHSTSRedirect(GURL* redirect_url) const;
 
   // TODO(willchan): Undo this. Only temporarily public.
   bool has_delegate() const { return delegate_ != NULL; }
 
   // NOTE(willchan): This is just temporary for debugging
@@ skipping 155 matching lines @@
   bool is_redirecting_;
 
   // Number of times we're willing to redirect.  Used to guard against
   // infinite redirects.
   int redirect_limit_;
 
   // Cached value for use after we've orphaned the job handling the
   // first transaction in a request involving redirects.
   UploadProgress final_upload_progress_;
 
-  // The priority level for this request.  Objects like
-  // ClientSocketPool use this to determine which URLRequest to
-  // allocate sockets to first.
+  // The priority level for this request.  Objects like ClientSocketPool use
+  // this to determine which URLRequest to allocate sockets to first.
   RequestPriority priority_;
 
   // TODO(battre): The only consumer of the identifier_ is currently the
   // web request API. We need to match identifiers of requests between the
   // web request API and the web navigation API. As the URLRequest does not
   // exist when the web navigation API is triggered, the tracking probably
   // needs to be done outside of the URLRequest anyway. Therefore, this
   // identifier should be deleted here. http://crbug.com/89321
   // A globally unique identifier for this request.
   const uint64 identifier_;
@@ skipping 34 matching lines @@
   LoadTimingInfo load_timing_info_;
 
   scoped_ptr<const base::debug::StackTrace> stack_trace_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequest);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_H_