Fix Cronet compilation and test errors.

components/cronet/android/url_request_adapter.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 "url_request_adapter.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/cronet/android/url_request_context_adapter.h"
 #include "components/cronet/android/wrapped_channel_upload_element_reader.h"
 #include "net/base/load_flags.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/http/http_status_code.h"
 
 namespace cronet {
 
 static const size_t kBufferSizeIncrement = 8192;
 
 URLRequestAdapter::URLRequestAdapter(URLRequestContextAdapter* context,
                                      URLRequestAdapterDelegate* delegate,
                                      GURL url,
                                      net::RequestPriority priority)
     : method_("GET"),
-      url_request_(NULL),
       read_buffer_(new net::GrowableIOBuffer()),
       bytes_read_(0),
       total_bytes_read_(0),
       error_code_(0),
       http_status_code_(0),
       canceled_(false),
       expected_size_(0),
       chunked_upload_(false) {
   context_ = context;
   delegate_ = delegate;
@@ skipping 75 matching lines @@
 }
 
 void URLRequestAdapter::OnInitiateConnection() {
   if (canceled_) {
     return;
   }
 
   VLOG(1) << "Starting chromium request: "
           << url_.possibly_invalid_spec().c_str()
           << " priority: " << RequestPriorityToString(priority_);
-  url_request_ = new net::URLRequest(
-      url_, net::DEFAULT_PRIORITY, this, context_->GetURLRequestContext());
+  url_request_ = context_->GetURLRequestContext()->CreateRequest(
+      url_, net::DEFAULT_PRIORITY, this, NULL);
   url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES);
   url_request_->set_method(method_);
   url_request_->SetExtraRequestHeaders(headers_);
   if (!headers_.HasHeader(net::HttpRequestHeaders::kUserAgent)) {
     std::string user_agent;
     user_agent = context_->GetUserAgent(url_);
     url_request_->SetExtraRequestHeaderByName(
         net::HttpRequestHeaders::kUserAgent, user_agent, true /* override */);
@@ skipping 138 matching lines @@
           << " and error: " << net::ErrorToString(error_code_);
   OnRequestCompleted();
 }
 
 void URLRequestAdapter::OnRequestCanceled() {
   OnRequestCompleted();
 }
 
 void URLRequestAdapter::OnRequestCompleted() {
   VLOG(1) << "Completed: " << url_.possibly_invalid_spec();
-  if (url_request_ != NULL) {
-    delete url_request_;
-    url_request_ = NULL;
-  }
+  url_request_.reset();

[mmenke, 2014/08/25 19:46:44]

Amusingly, I made this exact change in my CL to fix context destruction.

[mef, 2014/08/25 20:26:18]

Excellent!

 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestAdapter::Data() const {
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
 }  // namespace cronet