Added URLRequestContext to constructor for URLRequest.

net/test/spawner_communicator.cc

 // 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.
 
 #include "net/test/spawner_communicator.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/supports_user_data.h"
@@ skipping 145 matching lines @@
 
 void SpawnerCommunicator::SendCommandAndWaitForResultOnIOThread(
     const std::string& command,
     const std::string& post_data,
     int* result_code,
     std::string* data_received) {
   MessageLoop* loop = io_thread_.message_loop();
   DCHECK(loop);
   DCHECK_EQ(MessageLoop::current(), loop);
 
+  context_.reset(new TestURLRequestContext);
+
   // Prepare the URLRequest for sending the command.
   DCHECK(!cur_request_.get());

[mmenke, 2012/06/20 18:33:50]

Put this first, so the DCHECK occurs before the line that would delete the
context associated with the request that should not exist.

[shalev, 2012/06/20 20:13:12]

Done.

[shalev, 2012/06/20 20:13:12]

Done.

   cur_request_.reset(new URLRequest(GenerateSpawnerCommandURL(command, port_),
-                                    this));
+                                    this,
+                                    context_.get()));
   DCHECK(cur_request_.get());
   int current_request_id = ++next_id_;
   SpawnerRequestData* data = new SpawnerRequestData(current_request_id,
                                                     result_code,
                                                     data_received);
   DCHECK(data);
   cur_request_->SetUserData(this, data);
 
-  // Build the URLRequest.
-  context_.reset(new TestURLRequestContext);
-  cur_request_->set_context(context_.get());
   if (post_data.empty()) {
     cur_request_->set_method("GET");
   } else {
     cur_request_->set_method("POST");
     cur_request_->AppendBytesToUpload(post_data.c_str(), post_data.size());
     net::HttpRequestHeaders headers;
     headers.SetHeader(net::HttpRequestHeaders::kContentType,
                       "application/json");
     cur_request_->SetExtraRequestHeaders(headers);
   }
@@ skipping 171 matching lines @@
   std::string server_return_data;
   int result_code;
   SendCommandAndWaitForResult("kill", "", &result_code, &server_return_data);
   if (OK != result_code || server_return_data != "killed")
     return false;
   Shutdown();
   return true;
 }
 
 }  // namespace net