more changes

chrome/test/webdriver/session.cc

Index: chrome/test/webdriver/session.cc
diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc
index b43b4328c3200d2ec002c99bdf974dd05f063c49..5471139511a116105962ee2ed39f6a593728c921 100644
--- a/chrome/test/webdriver/session.cc
+++ b/chrome/test/webdriver/session.cc
@@ -524,7 +524,7 @@ Error* Session::SwitchToFrameWithNameOrId(const std::string& name_or_id) {
       "              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);
 }
 
@@ -549,7 +549,7 @@ Error* Session::SwitchToFrameWithIndex(int index) {
       "    '(/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);
 }
 
@@ -868,7 +868,7 @@ Error* Session::GetElementEffectiveStyle(
       "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);
@@ -915,7 +915,7 @@ Error* Session::IsElementDisplayed(const FrameId& frame_id,
       "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);
@@ -973,7 +973,7 @@ Error* Session::SetOptionElementSelected(const FrameId& frame_id,
                                          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);
@@ -1044,7 +1044,7 @@ Error* Session::GetAttribute(const WebElementId& element,
 
   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) {
@@ -1201,7 +1201,7 @@ Error* Session::ExecuteScriptAndParseResponse(const FrameId& frame_id,
     *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;
 }
@@ -1433,7 +1433,7 @@ Error* Session::GetElementRegionInViewHelper(
       "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());