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

chromeos/network/onc/onc_merger.cc

 // Copyright (c) 2012 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 "chromeos/network/onc/onc_merger.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 364 matching lines @@
     // This field is part of the provided ONCSignature, thus it can be
     // controlled by policy.
     std::string which_effective;
     scoped_ptr<base::Value> effective_value =
         MergeToEffective::MergeValues(key, values, &which_effective);
 
     if (IsIdentifierField(*signature_, key)) {
       // Don't augment the GUID but write the plain value.
       if (!effective_value) {
         LOG(ERROR) << "GUID field has no effective value";
-        return make_scoped_ptr<base::Value>(NULL);
+        return nullptr;
       }
 
       // DCHECK that all provided GUIDs are identical.
       DCHECK(AllPresentValuesEqual(values, *effective_value));
 
       // Return the un-augmented GUID.
       return effective_value.Pass();
     }
 
     scoped_ptr<base::DictionaryValue> augmented_value(
@@ skipping 36 matching lines @@
     if (HasUserPolicy() && values.user_editable) {
       augmented_value->SetBooleanWithoutPathExpansion(
           ::onc::kAugmentationUserEditable, true);
     }
     if (HasDevicePolicy() && values.device_editable) {
       augmented_value->SetBooleanWithoutPathExpansion(
           ::onc::kAugmentationDeviceEditable, true);
     }
     if (augmented_value->empty())
       augmented_value.reset();
-    return augmented_value.PassAs<base::Value>();
+    return augmented_value.Pass();
   }
 
   // MergeListOfDictionaries override.
   virtual DictionaryPtr MergeNestedDictionaries(
       const std::string& key,
       const DictPtrs &dicts) override {
     DictionaryPtr result;
     if (signature_) {
       const OncValueSignature* enclosing_signature = signature_;
       signature_ = NULL;
@@ skipping 36 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos