Pass() type followups after https://codereview.chromium.org/367403002/

components/policy/core/common/registry_dict_win.cc

 // Copyright 2013 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 "components/policy/core/common/registry_dict_win.h"
 
 #include "base/json/json_reader.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 52 matching lines @@
   int int_value = 0;
   switch (schema.type()) {
     case base::Value::TYPE_NULL: {
       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))
-            .PassAs<base::Value>();
+        return scoped_ptr<base::Value>(
+            base::Value::CreateBooleanValue(int_value != 0));
       }
       break;
     }
     case base::Value::TYPE_INTEGER: {
       // 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))
-            .PassAs<base::Value>();
+        return scoped_ptr<base::Value>(
+            base::Value::CreateIntegerValue(int_value));
       }
       break;
     }
     case base::Value::TYPE_DOUBLE: {
       // 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))
-            .PassAs<base::Value>();
+        return scoped_ptr<base::Value>(
+            base::Value::CreateDoubleValue(int_value));
       } else if (value.GetAsString(&string_value) &&
                  base::StringToDouble(string_value, &double_value)) {
-        return make_scoped_ptr(base::Value::CreateDoubleValue(double_value))
-            .PassAs<base::Value>();
+        return scoped_ptr<base::Value>(
+            base::Value::CreateDoubleValue(double_value));
       }
       break;
     }
     case base::Value::TYPE_LIST: {
       // Lists are encoded as subkeys with numbered value in the registry.
       const base::DictionaryValue* dict = NULL;
       if (value.GetAsDictionary(&dict)) {
         scoped_ptr<base::ListValue> result(new base::ListValue());
         for (int i = 1; ; ++i) {
           const base::Value* entry = NULL;
@@ skipping 138 matching lines @@
   ClearKeys();
   ClearValues();
 
   // First, read all the values of the key.
   for (RegistryValueIterator it(hive, root.c_str()); it.Valid(); ++it) {
     const std::string name = base::UTF16ToUTF8(it.Name());
     switch (it.Type()) {
       case REG_SZ:
       case REG_EXPAND_SZ:
         SetValue(name,
-                 make_scoped_ptr(new base::StringValue(
-                                     base::UTF16ToUTF8(it.Value()))).Pass());
+                 scoped_ptr<base::Value>(
+                     new base::StringValue(base::UTF16ToUTF8(it.Value()))));
         continue;
       case REG_DWORD_LITTLE_ENDIAN:
       case REG_DWORD_BIG_ENDIAN:
         if (it.ValueSize() == sizeof(DWORD)) {
           DWORD dword_value = *(reinterpret_cast<const DWORD*>(it.Value()));
           if (it.Type() == REG_DWORD_BIG_ENDIAN)
             dword_value = base::NetToHost32(dword_value);
           else
             dword_value = base::ByteSwapToLE32(dword_value);
           SetValue(name,
-                   make_scoped_ptr(base::Value::CreateIntegerValue(dword_value))
-                       .PassAs<base::Value>());
+                   scoped_ptr<base::Value>(
+                       base::Value::CreateIntegerValue(dword_value)));
           continue;
         }
       case REG_NONE:
       case REG_LINK:
       case REG_MULTI_SZ:
       case REG_RESOURCE_LIST:
       case REG_FULL_RESOURCE_DESCRIPTOR:
       case REG_RESOURCE_REQUIREMENTS_LIST:
       case REG_QWORD_LITTLE_ENDIAN:
         // Unsupported type, message gets logged below.
@@ skipping 65 matching lines @@
       return result.Pass();
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
   return scoped_ptr<base::Value>();
 }
 
 }  // namespace policy