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

chromeos/network/onc/onc_merger.cc

Index: chromeos/network/onc/onc_merger.cc
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 915f5492c56137e9be19c90bd198f9b50df7ca46..32efb0f3056a3ab68577dfb8794d4b7eba77621b 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -382,7 +382,7 @@ class MergeToAugmented : public MergeToEffective {
       // 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.
@@ -439,7 +439,7 @@ class MergeToAugmented : public MergeToEffective {
     }
     if (augmented_value->empty())
       augmented_value.reset();
-    return augmented_value.PassAs<base::Value>();
+    return augmented_value.Pass();
   }
 
   // MergeListOfDictionaries override.