Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Side by Side Diff: net/test/spawned_test_server/spawner_communicator.cc

Issue 197043005: original change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix other build error Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket_stream/socket_stream_unittest.cc ('k') | net/url_request/url_fetcher_core.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/test/spawned_test_server/spawner_communicator.h" 5 #include "net/test/spawned_test_server/spawner_communicator.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/supports_user_data.h" 10 #include "base/supports_user_data.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 int* result_code, 166 int* result_code,
167 std::string* data_received) { 167 std::string* data_received) {
168 base::MessageLoop* loop = io_thread_.message_loop(); 168 base::MessageLoop* loop = io_thread_.message_loop();
169 DCHECK(loop); 169 DCHECK(loop);
170 DCHECK_EQ(base::MessageLoop::current(), loop); 170 DCHECK_EQ(base::MessageLoop::current(), loop);
171 171
172 // Prepare the URLRequest for sending the command. 172 // Prepare the URLRequest for sending the command.
173 DCHECK(!cur_request_.get()); 173 DCHECK(!cur_request_.get());
174 context_.reset(new TestURLRequestContext); 174 context_.reset(new TestURLRequestContext);
175 cur_request_ = context_->CreateRequest( 175 cur_request_ = context_->CreateRequest(
176 GenerateSpawnerCommandURL(command, port_), DEFAULT_PRIORITY, this); 176 GenerateSpawnerCommandURL(command, port_), DEFAULT_PRIORITY, this, NULL);
177 DCHECK(cur_request_); 177 DCHECK(cur_request_);
178 int current_request_id = ++next_id_; 178 int current_request_id = ++next_id_;
179 SpawnerRequestData* data = new SpawnerRequestData(current_request_id, 179 SpawnerRequestData* data = new SpawnerRequestData(current_request_id,
180 result_code, 180 result_code,
181 data_received); 181 data_received);
182 DCHECK(data); 182 DCHECK(data);
183 cur_request_->SetUserData(this, data); 183 cur_request_->SetUserData(this, data);
184 184
185 if (post_data.empty()) { 185 if (post_data.empty()) {
186 cur_request_->set_method("GET"); 186 cur_request_->set_method("GET");
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 std::string server_return_data; 371 std::string server_return_data;
372 int result_code; 372 int result_code;
373 SendCommandAndWaitForResult("kill", "", &result_code, &server_return_data); 373 SendCommandAndWaitForResult("kill", "", &result_code, &server_return_data);
374 Shutdown(); 374 Shutdown();
375 if (OK != result_code || server_return_data != "killed") 375 if (OK != result_code || server_return_data != "killed")
376 return false; 376 return false;
377 return true; 377 return true;
378 } 378 }
379 379
380 } // namespace net 380 } // namespace net
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream_unittest.cc ('k') | net/url_request/url_fetcher_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698