Commit fcffe869 authored by thakis@chromium.org's avatar thakis@chromium.org

clang/win: Another followup to https://codereview.chromium.org/369303004/

BUG=82385
TBR=joaodasilva@chromium.org

Review URL: https://codereview.chromium.org/385373002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282844 0039d316-1c4b-4281-b951-d872f2087c98
parent b105e108
...@@ -318,7 +318,7 @@ scoped_ptr<base::Value> RegistryDict::ConvertToJSON( ...@@ -318,7 +318,7 @@ scoped_ptr<base::Value> RegistryDict::ConvertToJSON(
if (converted) if (converted)
result->SetWithoutPathExpansion(entry->first, converted.release()); result->SetWithoutPathExpansion(entry->first, converted.release());
} }
return result.Pass(); return result.PassAs<base::Value>();
} }
case base::Value::TYPE_LIST: { case base::Value::TYPE_LIST: {
scoped_ptr<base::ListValue> result(new base::ListValue()); scoped_ptr<base::ListValue> result(new base::ListValue());
...@@ -341,7 +341,7 @@ scoped_ptr<base::Value> RegistryDict::ConvertToJSON( ...@@ -341,7 +341,7 @@ scoped_ptr<base::Value> RegistryDict::ConvertToJSON(
} }
break; break;
} }
return result.Pass(); return result.PassAs<base::Value>();
} }
default: default:
LOG(WARNING) << "Can't convert registry key to schema type " << type; LOG(WARNING) << "Can't convert registry key to schema type " << type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment