more changes

chrome/test/webdriver/session.cc

 // Copyright (c) 2011 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/webdriver/session.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 506 matching lines @@
       "xpath += sub('[@name=\"$\" or @id=\"$\"]');"
       "var frame = document.evaluate(xpath, document, null, "
       "    XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;"
       "if (!frame) { return null; }"
       "xpath = frame.tagName == 'IFRAME' ? '/html/body//iframe'"
       "                                  : '/html/frameset/frame';"
       "frame_xpath = xpath + "
       "              sub('[@' + (frame.id == arg ? 'id' : 'name') + '=\"$\"]');"
       "return [frame, frame_xpath];";
   ListValue args;
-  args.Append(new StringValue(name_or_id));
+  args.Append(base::StringValue::New(name_or_id));
   return SwitchToFrameWithJavaScriptLocatedFrame(script, &args);
 }
 
 Error* Session::SwitchToFrameWithIndex(int index) {
   // We cannot simply index into window.frames because we need to know the
   // tagName of the frameElement. If child frame N is from another domain, then
   // the following will run afoul of the same origin policy:
   //   window.frames[N].frameElement;
   // Instead of indexing window.frames, we use a an XPath expression to index
   // into the list of all IFRAME and FRAME elements on the page - if we find
   // something, then that XPath expression can be used as the new frame's XPath.
   std::string script =
       "var index = '[' + (arguments[0] + 1) + ']';"
       "var xpath = '(/html/body//iframe|/html/frameset/frame)' + "
       "            index;"
       "console.info('searching for frame by xpath: ' + xpath);"
       "var frame = document.evaluate(xpath, document, null, "
       "XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;"
       "console.info(frame == null ? 'found nothing' : frame);"
       "if (!frame) { return null; }"
       "frame_xpath = ((frame.tagName == 'IFRAME' ? "
       "    '(/html/body//iframe)' : '/html/frameset/frame') + index);"
       "return [frame, frame_xpath];";
   ListValue args;
-  args.Append(Value::CreateIntegerValue(index));
+  args.Append(base::NumberValue::New(index));
   return SwitchToFrameWithJavaScriptLocatedFrame(script, &args);
 }
 
 Error* Session::SwitchToFrameWithElement(const WebElementId& element) {
   // TODO(jleyba): Extract this, and the other frame switch methods to an atom.
   std::string script =
       "var element = arguments[0];"
       "console.info('Attempting to switch to ' + element);"
       "if (element.nodeType != 1 || !/^i?frame$/i.test(element.tagName)) {"
       "  console.info('Element is not a frame: ' + element + "
@@ skipping 298 matching lines @@
 
 Error* Session::GetElementEffectiveStyle(
     const FrameId& frame_id,
     const WebElementId& element,
     const std::string& prop,
     std::string* value) {
   std::string script = base::StringPrintf(
       "return (%s).apply(null, arguments);", atoms::GET_EFFECTIVE_STYLE);
   ListValue args;
   args.Append(element.ToValue());
-  args.Append(Value::CreateStringValue(prop));
+  args.Append(base::StringValue::New(prop));
   Value* unscoped_result = NULL;
   Error* error = ExecuteScript(
       frame_id, script, &args, &unscoped_result);
   scoped_ptr<Value> result(unscoped_result);
   if (error) {
     error->AddDetails(base::StringPrintf(
         "GetEffectiveStyle atom failed for property (%s)", prop.c_str()));
     return error;
   }
 
@@ skipping 26 matching lines @@
 }
 
 Error* Session::IsElementDisplayed(const FrameId& frame_id,
                                    const WebElementId& element,
                                    bool ignore_opacity,
                                    bool* is_displayed) {
   std::string script = base::StringPrintf(
       "return (%s).apply(null, arguments);", atoms::IS_DISPLAYED);
   ListValue args;
   args.Append(element.ToValue());
-  args.Append(Value::CreateBooleanValue(ignore_opacity));
+  args.Append(base::BooleanValue::New(ignore_opacity));
 
   Value* unscoped_result = NULL;
   Error* error = ExecuteScript(frame_id, script, &args, &unscoped_result);
   scoped_ptr<Value> result(unscoped_result);
   if (error)
     return error;
   if (!result->GetAsBoolean(is_displayed))
     return new Error(kUnknownError, "IsDisplayed atom returned non-boolean: " +
                          JsonStringify(result.get()));
   return NULL;
@@ skipping 37 matching lines @@
                          JsonStringify(result));
   }
   return NULL;
 }
 
 Error* Session::SetOptionElementSelected(const FrameId& frame_id,
                                          const WebElementId& element,
                                          bool selected) {
   ListValue args;
   args.Append(element.ToValue());
-  args.Append(Value::CreateBooleanValue(selected));
+  args.Append(base::BooleanValue::New(selected));
 
   std::string script = base::StringPrintf(
       "return (%s).apply(null, arguments);", atoms::SET_SELECTED);
 
   Value* unscoped_result = NULL;
   Error* error = ExecuteScript(frame_id, script, &args, &unscoped_result);
   scoped_ptr<Value> result(unscoped_result);
   return error;
 }
 
@@ skipping 50 matching lines @@
   return NULL;
 }
 
 Error* Session::GetAttribute(const WebElementId& element,
                              const std::string& key, Value** value) {
   std::string script = base::StringPrintf(
       "return (%s).apply(null, arguments);", atoms::GET_ATTRIBUTE);
 
   ListValue args;
   args.Append(element.ToValue());
-  args.Append(Value::CreateStringValue(key));
+  args.Append(base::StringValue::New(key));
 
   Error* error = ExecuteScript(script, &args, value);
   if (error) {
     return error;
   }
 
   return NULL;
 }
 
 Error* Session::WaitForAllTabsToStopLoading() {
@@ skipping 136 matching lines @@
     if (error_msg.empty())
       error_msg = "Script failed with error code: " + base::IntToString(code);
     return new Error(code, error_msg);
   }
 
   Value* tmp;
   if (result_dict->Get("value", &tmp)) {
     *script_result= tmp->DeepCopy();
   } else {
     // "value" was not defined in the returned dictionary; set to null.
-    *script_result= Value::CreateNullValue();
+    *script_result= base::NullValue();
   }
   return NULL;
 }
 
 void Session::SendKeysOnSessionThread(const string16& keys, Error** error) {
   std::vector<WebKeyEvent> key_events;
   std::string error_msg;
   if (!ConvertKeysToWebKeyEvents(keys, &key_events, &error_msg)) {
     *error = new Error(kUnknownError, error_msg);
     return;
@@ skipping 211 matching lines @@
     const FrameId& frame_id,
     const WebElementId& element,
     const gfx::Rect& region,
     bool center,
     bool verify_clickable_at_middle,
     gfx::Point* location) {
   std::string jscript = base::StringPrintf(
       "return (%s).apply(null, arguments);", atoms::GET_LOCATION_IN_VIEW);
   ListValue jscript_args;
   jscript_args.Append(element.ToValue());
-  jscript_args.Append(Value::CreateBooleanValue(center));
+  jscript_args.Append(base::BooleanValue::New(center));
   DictionaryValue* elem_offset_dict = new DictionaryValue();
   elem_offset_dict->SetInteger("left", region.x());
   elem_offset_dict->SetInteger("top", region.y());
   elem_offset_dict->SetInteger("width", region.width());
   elem_offset_dict->SetInteger("height", region.height());
   jscript_args.Append(elem_offset_dict);
   Value* unscoped_value = NULL;
   Error* error = ExecuteScript(frame_id, jscript, &jscript_args,
                                &unscoped_value);
   scoped_ptr<Value> value(unscoped_value);
@@ skipping 80 matching lines @@
   if (error)
     return error;
   if (!value->GetAsInteger(status))
     return new Error(kUnknownError,
                      "GET_APPCACHE_STATUS script returned non-integer: " +
                      JsonStringify(value.get()));
   return NULL;
 }
 
 }  // namespace webdriver