diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-16 12:15:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 19:16:38 +0000 |
| commit | b92d87bee7689009c26be560634070a33508bcaf (patch) | |
| tree | 6d2846ea6a8494b31287796a31d125508ef7cbad /chromeos/network | |
| parent | 327e5f5ff9b03e437d3f3e27efe1054f76ed89ac (diff) | |
| download | chromium_src-b92d87bee7689009c26be560634070a33508bcaf.zip chromium_src-b92d87bee7689009c26be560634070a33508bcaf.tar.gz chromium_src-b92d87bee7689009c26be560634070a33508bcaf.tar.bz2 | |
Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>.
BUG=423621
Review URL: https://codereview.chromium.org/660663003
Cr-Commit-Position: refs/heads/master@{#299949}
Diffstat (limited to 'chromeos/network')
| -rw-r--r-- | chromeos/network/onc/onc_merger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc index 915f549..32efb0f 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. |