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

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

Issue 9465030: Break two classes defined in json_value_serializer.cc, .h into separate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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_uitest.cc ('k') | chrome/test/automation/tab_proxy.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) 2011 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/javascript_execution_controller.h" 5 #include "chrome/test/automation/javascript_execution_controller.h"
6 6
7 #include "base/json/json_value_serializer.h" 7 #include "base/json/json_string_value_serializer.h"
8 #include "chrome/test/automation/javascript_message_utils.h" 8 #include "chrome/test/automation/javascript_message_utils.h"
9 9
10 using javascript_utils::JavaScriptPrintf; 10 using javascript_utils::JavaScriptPrintf;
11 11
12 // Initialize this timeout to an invalid value. Each test framework or test 12 // Initialize this timeout to an invalid value. Each test framework or test
13 // must set an appropriate timeout using set_timeout, or the 13 // must set an appropriate timeout using set_timeout, or the
14 // JavaScriptExecutionController will complain. 14 // JavaScriptExecutionController will complain.
15 int JavaScriptExecutionController::timeout_ms_ = -1; 15 int JavaScriptExecutionController::timeout_ms_ = -1;
16 16
17 JavaScriptExecutionController::JavaScriptExecutionController() {} 17 JavaScriptExecutionController::JavaScriptExecutionController() {}
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return false; 101 return false;
102 } 102 }
103 if (!success) { 103 if (!success) {
104 LOG(WARNING) << "JavaScript evaluation did not complete successfully: " 104 LOG(WARNING) << "JavaScript evaluation did not complete successfully: "
105 << evaluation_error; 105 << evaluation_error;
106 return false; 106 return false;
107 } 107 }
108 result->reset(evaluation_result_value); 108 result->reset(evaluation_result_value);
109 return true; 109 return true;
110 } 110 }
OLDNEW
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/automation/tab_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698