more changes

chrome/test/automation/javascript_message_utils.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_JAVASCRIPT_MESSAGE_UTILS_H_
 #define CHROME_TEST_AUTOMATION_JAVASCRIPT_MESSAGE_UTILS_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 
 // ValueConversionTraits contains functions for creating a value from a
 // type, and setting a type from a value. This is general-purpose and can
 // be moved to a common location if needed.
 template <class T>
 struct ValueConversionTraits {
 };
 
 template <>
 struct ValueConversionTraits<int> {
   static Value* CreateValue(int t) {
-    return Value::CreateIntegerValue(t);
+    return base::NumberValue::New(t);
   }
   static bool SetFromValue(Value* value, int* t) {
     return value->GetAsInteger(t);
   }
 };
 
 template <>
 struct ValueConversionTraits<bool> {
   static Value* CreateValue(bool t) {
-    return Value::CreateBooleanValue(t);
+    return base::BooleanValue::New(t);
   }
   static bool SetFromValue(Value* value, bool* t) {
     return value->GetAsBoolean(t);
   }
 };
 
 template <>
 struct ValueConversionTraits<std::string> {
   static Value* CreateValue(const std::string& t) {
-    return Value::CreateStringValue(t);
+    return base::StringValue::New(t);
   }
   static bool SetFromValue(Value* value, std::string* t) {
     return value->GetAsString(t);
   }
 };
 
 template <>
 struct ValueConversionTraits<DOMElementProxy::By> {
   typedef DOMElementProxy::By type;
   static Value* CreateValue(const type& t) {
@@ skipping 76 matching lines @@
                              const T2& arg2, const T3& arg3) {
   return base::StringPrintf(format.c_str(),
                             JSONStringify(arg1).c_str(),
                             JSONStringify(arg2).c_str(),
                             JSONStringify(arg3).c_str());
 }
 
 }  // namespace javascript_utils
 
 #endif  // CHROME_TEST_AUTOMATION_JAVASCRIPT_MESSAGE_UTILS_H_