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

Side by Side Diff: chrome/test/automation/automation_proxy.cc

Issue 10836015: Convert more automation calls to the JSON interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix some failing tests. Created 8 years, 4 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 | « chrome/test/automation/automation_proxy.h ('k') | chrome/test/automation/browser_proxy.h » ('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 "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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 !success) 459 !success)
460 return false; 460 return false;
461 buffer.AddFragment(chunk); 461 buffer.AddFragment(chunk);
462 } 462 }
463 buffer.Finish(); 463 buffer.Finish();
464 464
465 *json_trace_output = output.json_output; 465 *json_trace_output = output.json_output;
466 return true; 466 return true;
467 } 467 }
468 468
469 bool AutomationProxy::ResetToDefaultTheme() {
470 return Send(new AutomationMsg_ResetToDefaultTheme());
471 }
472
473 bool AutomationProxy::SendJSONRequest(const std::string& request, 469 bool AutomationProxy::SendJSONRequest(const std::string& request,
474 int timeout_ms, 470 int timeout_ms,
475 std::string* response) { 471 std::string* response) {
476 bool result = false; 472 bool result = false;
477 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result)) 473 if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result))
478 return false; 474 return false;
479 return result; 475 return result;
480 } 476 }
OLDNEW
« no previous file with comments | « chrome/test/automation/automation_proxy.h ('k') | chrome/test/automation/browser_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698