Add missing Pass() calls for passing scoped_ptrs on Windows.

components/policy/core/common/registry_dict_win.cc

Index: components/policy/core/common/registry_dict_win.cc
diff --git a/components/policy/core/common/registry_dict_win.cc b/components/policy/core/common/registry_dict_win.cc
index 47746522dd843675c1bfb039eb906620566c7d99..cd6887c20b6ae2cffa1896d27dc896ed321fc4b1 100644
--- a/components/policy/core/common/registry_dict_win.cc
+++ b/components/policy/core/common/registry_dict_win.cc
@@ -27,7 +27,7 @@ namespace {
 scoped_ptr<base::Value> ConvertValue(const base::Value& value,
                                      const Schema& schema) {
   if (!schema.valid())
-    return make_scoped_ptr(value.DeepCopy());
+    return make_scoped_ptr(value.DeepCopy()).Pass();
 
   // If the type is good already, go with it.
   if (value.IsType(schema.type())) {
@@ -43,7 +43,7 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
         if (converted)
           result->SetWithoutPathExpansion(entry.key(), converted.release());
       }
-      return result.Pass();
+      return result.PassAs<base::Value>();
     } else if (value.GetAsList(&list)) {
       scoped_ptr<base::ListValue> result(new base::ListValue());
       for (base::ListValue::const_iterator entry(list->begin());
@@ -53,9 +53,9 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
         if (converted)
           result->Append(converted.release());
       }
-      return result.Pass();
+      return result.PassAs<base::Value>();
     }
-    return make_scoped_ptr(value.DeepCopy());
+    return make_scoped_ptr(value.DeepCopy()).Pass();
   }
 
   // Else, do some conversions to map windows registry data types to JSON types.
@@ -63,14 +63,15 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
   int int_value = 0;
   switch (schema.type()) {
     case base::Value::TYPE_NULL: {
-      return make_scoped_ptr(base::Value::CreateNullValue());
+      return make_scoped_ptr(base::Value::CreateNullValue()).Pass();
     }
     case base::Value::TYPE_BOOLEAN: {
       // Accept booleans encoded as either string or integer.
       if (value.GetAsInteger(&int_value) ||
           (value.GetAsString(&string_value) &&
            base::StringToInt(string_value, &int_value))) {
-        return make_scoped_ptr(base::Value::CreateBooleanValue(int_value != 0));
+        return make_scoped_ptr(base::Value::CreateBooleanValue(int_value != 0))
+            .PassAs<base::Value>();
       }
       break;
     }
@@ -78,7 +79,8 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
       // Integers may be string-encoded.
       if (value.GetAsString(&string_value) &&
           base::StringToInt(string_value, &int_value)) {
-        return make_scoped_ptr(base::Value::CreateIntegerValue(int_value));
+        return make_scoped_ptr(base::Value::CreateIntegerValue(int_value))
+            .PassAs<base::Value>();
       }
       break;
     }
@@ -86,10 +88,12 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
       // Doubles may be string-encoded or integer-encoded.
       double double_value = 0;
       if (value.GetAsInteger(&int_value)) {
-        return make_scoped_ptr(base::Value::CreateDoubleValue(int_value));
+        return make_scoped_ptr(base::Value::CreateDoubleValue(int_value))
+            .PassAs<base::Value>();
       } else if (value.GetAsString(&string_value) &&
                  base::StringToDouble(string_value, &double_value)) {
-        return make_scoped_ptr(base::Value::CreateDoubleValue(double_value));
+        return make_scoped_ptr(base::Value::CreateDoubleValue(double_value))
+            .PassAs<base::Value>();
       }
       break;
     }
@@ -107,7 +111,7 @@ scoped_ptr<base::Value> ConvertValue(const base::Value& value,
           if (converted)
             result->Append(converted.release());
         }
-        return result.Pass();
+        return result.PassAs<base::Value>();
       }
       // Fall through in order to accept lists encoded as JSON strings.
     }
@@ -228,7 +232,7 @@ void RegistryDict::Merge(const RegistryDict& other) {
 
   for (ValueMap::const_iterator entry(other.values_.begin());
        entry != other.values_.end(); ++entry) {
-    SetValue(entry->first, make_scoped_ptr(entry->second->DeepCopy()));
+    SetValue(entry->first, make_scoped_ptr(entry->second->DeepCopy()).Pass());
   }
 }
 
@@ -247,10 +251,9 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
     switch (it.Type()) {
       case REG_SZ:
       case REG_EXPAND_SZ:
-        SetValue(
-            name,
-            make_scoped_ptr(
-                new base::StringValue(base::UTF16ToUTF8(it.Value()))));
+        SetValue(name,
+                 make_scoped_ptr(new base::StringValue(
+                                     base::UTF16ToUTF8(it.Value()))).Pass());
         continue;
       case REG_DWORD_LITTLE_ENDIAN:
       case REG_DWORD_BIG_ENDIAN:
@@ -260,9 +263,9 @@ void RegistryDict::ReadRegistry(HKEY hive, const base::string16& root) {
             dword_value = base::NetToHost32(dword_value);
           else
             dword_value = base::ByteSwapToLE32(dword_value);
-          SetValue(
-              name,
-              make_scoped_ptr(base::Value::CreateIntegerValue(dword_value)));
+          SetValue(name,
+                   make_scoped_ptr(base::Value::CreateIntegerValue(dword_value))
+                       .PassAs<base::Value>());
           continue;
         }
       case REG_NONE: