Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42

mojo/services/network/url_loader_impl.cc

 // Copyright 2014 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.
 
 #include "mojo/services/network/url_loader_impl.h"
 
 #include <memory>
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 250 matching lines @@
 URLLoaderImpl::URLLoaderImpl(NetworkContext* context,
                              InterfaceRequest<URLLoader> request,
                              std::vector<URLLoaderInterceptorPtr> interceptors)
     : context_(context),
       interceptors_(std::move(interceptors)),
       response_body_buffer_size_(0),
       auto_follow_redirects_(true),
       current_fetcher_id_(0),
       binding_(this, request.Pass()) {
   for (auto& interceptor : interceptors_) {
-    interceptor.set_error_handler(this);
+    interceptor.set_connection_error_handler([this]() { delete this; });

[ppi, 2015/07/16 12:35:54]

Is this intentional change that we now `delete this;` instead of calling
OnConnectionError()?

[ppi, 2015/07/16 12:39:45]

I'd suggest to make this fix separately for history clarity.

[qsr, 2015/07/16 12:41:40]

Done.

   }
   interceptor_index_ = interceptors_.size() - 1;
-  binding_.set_error_handler(this);
+  binding_.set_connection_error_handler([this]() { OnConnectionError(); });
   context_->RegisterURLLoader(this);
 }
 
 URLLoaderImpl::~URLLoaderImpl() {
   context_->DeregisterURLLoader(this);
 }
 
 void URLLoaderImpl::Cleanup() {
   // The associated network context is going away and we have to destroy
   // net::URLRequest hold by this loader.
@@ skipping 44 matching lines @@
       status = last_status_.Clone();
     } else {
       // No network request has been made yet.
       status->is_loading = false;
     }
   }
   // TODO(darin): Populate more status fields.
   callback.Run(status.Pass());
 }
 
-void URLLoaderImpl::OnConnectionError() {
-  binding_.Close();
-  if (body_fetchers_.empty())
-    delete this;
-}
-
 void URLLoaderImpl::OnReceivedRedirect(net::URLRequest* url_request,
                                        const net::RedirectInfo& redirect_info,
                                        bool* defer_redirect) {
   DCHECK(url_request == url_request_.get());
   DCHECK(url_request->status().is_success());
   DCHECK(!redirect_info_);
 
   if (auto_follow_redirects_)
     return;
 
@@ skipping 37 matching lines @@
   body_fetchers_.push_back(std::move(body_fetcher));
   body_fetchers_.back()->Start();
 }
 
 void URLLoaderImpl::OnReadCompleted(net::URLRequest* url_request,
                                     int bytes_read) {
   // This should never be called on this object.
   DCHECK(false);
 }
 
+void URLLoaderImpl::OnConnectionError() {
+  binding_.Close();
+  if (body_fetchers_.empty())
+    delete this;
+}
+
 void URLLoaderImpl::SendError(
     int error_code,
     const Callback<void(URLResponsePtr)>& callback) {
   URLResponsePtr response(URLResponse::New());
   if (url_request_)
     response->url = String::From(url_request_->url());
   response->error = MakeNetworkError(error_code);
   callback.Run(response.Pass());
 }
 
@@ skipping 117 matching lines @@
   }
   if (request->body) {
     ScopedVector<net::UploadElementReader> element_readers;
     for (size_t i = 0; i < request->body.size(); ++i) {
       element_readers.push_back(
           new UploadDataPipeElementReader(request->body[i].Pass()));
     }
     url_request_->set_upload(make_scoped_ptr<net::UploadDataStream>(
         new net::ElementsUploadDataStream(element_readers.Pass(), 0)));
   }
+  int load_flags = 0;
   if (request->bypass_cache)
-    url_request_->SetLoadFlags(net::LOAD_BYPASS_CACHE);
+    load_flags |= net::LOAD_BYPASS_CACHE;
+  if (request->only_from_cache)
+    load_flags |= net::LOAD_ONLY_FROM_CACHE;
+  if (load_flags)
+    url_request_->SetLoadFlags(load_flags);
 
   response_body_buffer_size_ = request->response_body_buffer_size;
   auto_follow_redirects_ = request->auto_follow_redirects;
 
   url_request_->Start();
 }
 
 void URLLoaderImpl::SendResponse(URLResponsePtr response) {
   if (interceptor_index_ >= 0 &&
       interceptor_index_ < static_cast<int>(interceptors_.size())) {
@@ skipping 20 matching lines @@
   if ((*it)->id() == current_fetcher_id_) {
     last_status_ = fetcher->QueryStatus();
     last_status_->is_loading = false;
   }
   body_fetchers_.erase(it);
   if (body_fetchers_.empty() and !binding_.is_bound())
     delete this;
 }
 
 }  // namespace mojo