Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.

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 25 matching lines @@
     const base::ListValue* list = NULL;
     if (value.GetAsDictionary(&dict)) {
       scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
       for (base::DictionaryValue::Iterator entry(*dict); !entry.IsAtEnd();
            entry.Advance()) {
         scoped_ptr<base::Value> converted =
             ConvertValue(entry.value(), schema.GetProperty(entry.key()));
         if (converted)
           result->SetWithoutPathExpansion(entry.key(), converted.release());
       }
-      return result.PassAs<base::Value>();
+      return result.Pass();
     } else if (value.GetAsList(&list)) {
       scoped_ptr<base::ListValue> result(new base::ListValue());
       for (base::ListValue::const_iterator entry(list->begin());
            entry != list->end(); ++entry) {
         scoped_ptr<base::Value> converted =
             ConvertValue(**entry, schema.GetItems());
         if (converted)
           result->Append(converted.release());
       }
       return result.PassAs<base::Value>();
@@ skipping 65 matching lines @@
       break;
     }
     case base::Value::TYPE_STRING:
     case base::Value::TYPE_BINARY:
       // No conversion possible.
       break;
   }
 
   LOG(WARNING) << "Failed to convert " << value.GetType()
                << " to " << schema.type();
-  return scoped_ptr<base::Value>();
+  return nullptr;
 }
 
 }  // namespace
 
 bool CaseInsensitiveStringCompare::operator()(const std::string& a,
                                               const std::string& b) const {
   return base::strcasecmp(a.c_str(), b.c_str()) < 0;
 }
 
 RegistryDict::RegistryDict() {}
@@ skipping 165 matching lines @@
       }
       for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
            entry != keys_.end(); ++entry) {
         Schema subschema =
             schema.valid() ? schema.GetProperty(entry->first) : Schema();
         scoped_ptr<base::Value> converted =
             entry->second->ConvertToJSON(subschema);
         if (converted)
           result->SetWithoutPathExpansion(entry->first, converted.release());
       }
-      return result.PassAs<base::Value>();
+      return result.Pass();
     }
     case base::Value::TYPE_LIST: {
       scoped_ptr<base::ListValue> result(new base::ListValue());
       Schema item_schema = schema.valid() ? schema.GetItems() : Schema();
       for (int i = 1; ; ++i) {
         const std::string name(base::IntToString(i));
         const RegistryDict* key = GetKey(name);
         if (key) {
           scoped_ptr<base::Value> converted = key->ConvertToJSON(item_schema);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         const base::Value* value = GetValue(name);
         if (value) {
           scoped_ptr<base::Value> converted = ConvertValue(*value, item_schema);
           if (converted)
             result->Append(converted.release());
           continue;
         }
         break;
       }
-      return result.PassAs<base::Value>();
+      return result.Pass();
     }
     default:
       LOG(WARNING) << "Can't convert registry key to schema type " << type;
   }
 
-  return scoped_ptr<base::Value>();
+  return nullptr;
 }
 
 }  // namespace policy