| OLD | NEW |
| 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 "chrome/test/automation/automation_proxy.h" | 5 #include "chrome/test/automation/automation_proxy.h" |
| 6 | 6 |
| 7 #include <sstream> | 7 #include <sstream> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 void AutomationProxy::SetChannel(IPC::Channel* channel) { | 422 void AutomationProxy::SetChannel(IPC::Channel* channel) { |
| 423 if (tracker_.get()) | 423 if (tracker_.get()) |
| 424 tracker_->put_channel(channel); | 424 tracker_->put_channel(channel); |
| 425 } | 425 } |
| 426 | 426 |
| 427 void AutomationProxy::ResetChannel() { | 427 void AutomationProxy::ResetChannel() { |
| 428 if (tracker_.get()) | 428 if (tracker_.get()) |
| 429 tracker_->put_channel(NULL); | 429 tracker_->put_channel(NULL); |
| 430 } | 430 } |
| 431 | 431 |
| 432 bool AutomationProxy::BeginTracing(const std::string& categories) { | 432 bool AutomationProxy::BeginTracing(const std::string& category_patterns) { |
| 433 bool result = false; | 433 bool result = false; |
| 434 bool send_success = Send(new AutomationMsg_BeginTracing(categories, | 434 bool send_success = Send(new AutomationMsg_BeginTracing(category_patterns, |
| 435 &result)); | 435 &result)); |
| 436 return send_success && result; | 436 return send_success && result; |
| 437 } | 437 } |
| 438 | 438 |
| 439 bool AutomationProxy::EndTracing(std::string* json_trace_output) { | 439 bool AutomationProxy::EndTracing(std::string* json_trace_output) { |
| 440 bool success = false; | 440 bool success = false; |
| 441 size_t num_trace_chunks = 0; | 441 size_t num_trace_chunks = 0; |
| 442 if (!Send(new AutomationMsg_EndTracing(&num_trace_chunks, &success)) || | 442 if (!Send(new AutomationMsg_EndTracing(&num_trace_chunks, &success)) || |
| 443 !success) | 443 !success) |
| 444 return false; | 444 return false; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 467 } | 467 } |
| 468 | 468 |
| 469 bool AutomationProxy::SendJSONRequest(const std::string& request, | 469 bool AutomationProxy::SendJSONRequest(const std::string& request, |
| 470 int timeout_ms, | 470 int timeout_ms, |
| 471 std::string* response) { | 471 std::string* response) { |
| 472 bool result = false; | 472 bool result = false; |
| 473 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result)) | 473 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result)) |
| 474 return false; | 474 return false; |
| 475 return result; | 475 return result; |
| 476 } | 476 } |
| OLD | NEW |