| Index: extensions/browser/api/declarative/declarative_api.cc
|
| diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc
|
| index 6fdeacc6ed4dee733efc3d9a7edf7278887c588b..84dbfffe50c3a907f8a2c9e76ed680bbb14b6a7e 100644
|
| --- a/extensions/browser/api/declarative/declarative_api.cc
|
| +++ b/extensions/browser/api/declarative/declarative_api.cc
|
| @@ -41,12 +41,11 @@ void ConvertBinaryDictionaryValuesToBase64(base::DictionaryValue* dict);
|
|
|
| // Encodes |binary| as base64 and returns a new StringValue populated with the
|
| // encoded string.
|
| -std::unique_ptr<base::StringValue> ConvertBinaryToBase64(
|
| - base::BinaryValue* binary) {
|
| +std::unique_ptr<base::Value> ConvertBinaryToBase64(base::BinaryValue* binary) {
|
| std::string binary_data = std::string(binary->GetBuffer(), binary->GetSize());
|
| std::string data64;
|
| base::Base64Encode(binary_data, &data64);
|
| - return std::unique_ptr<base::StringValue>(new base::StringValue(data64));
|
| + return std::unique_ptr<base::Value>(new base::Value(data64));
|
| }
|
|
|
| // Parses through |args| replacing any BinaryValues with base64 encoded
|
|
|