Roll Chrome into Mojo.

base/values.h

Index: base/values.h
diff --git a/base/values.h b/base/values.h
index 04b2d26eac603d37300453bdc50daeabd8acea59..4c22f3ddc3e24445ad85bb75bd648b1b0d8a0488 100644
--- a/base/values.h
+++ b/base/values.h
@@ -228,9 +228,9 @@ class BASE_EXPORT DictionaryValue : public Value {
   // within a key, but there are no other restrictions on keys.
   // If the key at any step of the way doesn't exist, or exists but isn't
   // a DictionaryValue, a new DictionaryValue will be created and attached
-  // to the path in that location.
-  // Note that the dictionary takes ownership of the value referenced by
-  // |in_value|, and therefore |in_value| must be non-NULL.
+  // to the path in that location. |in_value| must be non-null.
+  void Set(const std::string& path, scoped_ptr<Value> in_value);
+  // Deprecated version of the above. TODO(estade): remove.
   void Set(const std::string& path, Value* in_value);
 
   // Convenience forms of Set().  These methods will replace any existing
@@ -243,6 +243,9 @@ class BASE_EXPORT DictionaryValue : public Value {
 
   // Like Set(), but without special treatment of '.'.  This allows e.g. URLs to
   // be used as paths.
+  void SetWithoutPathExpansion(const std::string& key,
+                               scoped_ptr<Value> in_value);
+  // Deprecated version of the above. TODO(estade): remove.
   void SetWithoutPathExpansion(const std::string& key, Value* in_value);
 
   // Convenience forms of SetWithoutPathExpansion().