[chromedriver] Create release script and handle Chrome/ChromeDriver versions.

chrome/test/chromedriver/chrome_impl.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 "chrome/test/chromedriver/chrome_impl.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/process_util.h"
@@ skipping 110 matching lines @@
                                 const std::string& function,
                                 const base::ListValue& args,
                                 scoped_ptr<base::Value>* result) {
   std::string json;
   base::JSONWriter::Write(&args, &json);
   std::string expression = base::StringPrintf(
       "(%s).apply(null, [%s, %s])",
       kCallFunctionScript,
       function.c_str(),
       json.c_str());
-  return EvaluateScript(frame, expression, result);
+  scoped_ptr<base::Value> temp_result;
+  Status status = EvaluateScript(frame, expression, &temp_result);
+  if (status.IsError())
+    return status;
+
+  return internal::ParseCallFunctionResult(*temp_result.get(), result);

[chrisgao (Use stgao instead), 2013/01/22 19:17:31]

I think "*temp_result" would also work here.

[kkania, 2013/02/28 21:50:17]

Done.

 }
 
 Status ChromeImpl::GetFrameByFunction(const std::string& frame,
                                       const std::string& function,
                                       const base::ListValue& args,
                                       std::string* out_frame) {
   int context_id;
   Status status = GetContextIdForFrame(dom_tracker_.get(), frame, &context_id);
   if (status.IsError())
     return status;
@@ skipping 93 matching lines @@
   if (status.IsError())
     return status;
 
   std::string type;
   if (!temp_result->GetString("type", &type))
     return Status(kUnknownError, "Runtime.evaluate missing string 'type'");
 
   if (type == "undefined") {
     result->reset(base::Value::CreateNullValue());
   } else {
-    int status_code;
-    if (!temp_result->GetInteger("value.status", &status_code)) {
-      return Status(kUnknownError,
-                    "Runtime.evaluate missing int 'value.status'");
-    }
-    if (status_code != kOk)
-      return Status(static_cast<StatusCode>(status_code));
-    base::Value* unscoped_value;
-    if (!temp_result->Get("value.value", &unscoped_value)) {
-      return Status(kUnknownError,
-                    "Runtime.evaluate missing 'value.value'");
-    }
-    result->reset(unscoped_value->DeepCopy());
+    base::Value* value;
+    if (!temp_result->Get("value", &value))
+      return Status(kUnknownError, "Runtime.evaluate missing 'value'");
+    result->reset(value->DeepCopy());
   }
   return Status(kOk);
 }
 
+Status ParseCallFunctionResult(const base::Value& temp_result,
+                               scoped_ptr<base::Value>* result) {
+  const base::DictionaryValue* dict;
+  if (!temp_result.GetAsDictionary(&dict))
+    return Status(kUnknownError, "call function result must be a dictionary");
+  int status_code;
+  if (!dict->GetInteger("status", &status_code)) {
+    return Status(kUnknownError,
+                  "call function result missing int 'status'");
+  }
+  if (status_code != kOk)
+    return Status(static_cast<StatusCode>(status_code));
+  const base::Value* unscoped_value;
+  if (!dict->Get("value", &unscoped_value)) {
+    return Status(kUnknownError,
+                  "call function result missing 'value'");
+  }
+  result->reset(unscoped_value->DeepCopy());
+  return Status(kOk);
+}
+
 Status GetNodeIdFromFunction(DevToolsClient* client,
                              int context_id,
                              const std::string& function,
                              const base::ListValue& args,
                              int* node_id) {
   std::string json;
   base::JSONWriter::Write(&args, &json);
   std::string expression = base::StringPrintf(
       "(%s).apply(null, [%s, %s, true])",
       kCallFunctionScript,
@@ skipping 26 matching lines @@
   }
   if (status.IsError())
     return status;
 
   if (!cmd_result->GetInteger("nodeId", node_id))
     return Status(kUnknownError, "DOM.requestNode missing int 'nodeId'");
   return Status(kOk);
 }
 
 }  // namespace internal