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 518 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