| Index: chrome/browser/extensions/api/serial/serial_api.cc
|
| diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc
|
| index 8392df58aa9b91372fc4db0ede8f9c3e03b74bcb..a537a66c2592dd720ac26285fbb94a2ec6f7f2c0 100644
|
| --- a/chrome/browser/extensions/api/serial/serial_api.cc
|
| +++ b/chrome/browser/extensions/api/serial/serial_api.cc
|
| @@ -38,7 +38,7 @@ void SerialGetPortsFunction::Work() {
|
| ports->Append(Value::CreateStringValue(*i++));
|
| }
|
|
|
| - result_.reset(ports);
|
| + SetSingleResult(ports);
|
| }
|
|
|
| bool SerialGetPortsFunction::Respond() {
|
| @@ -85,12 +85,12 @@ void SerialOpenFunction::Work() {
|
|
|
| DictionaryValue* result = new DictionaryValue();
|
| result->SetInteger(kConnectionIdKey, id);
|
| - result_.reset(result);
|
| + SetSingleResult(result);
|
| AsyncWorkCompleted();
|
| } else {
|
| DictionaryValue* result = new DictionaryValue();
|
| result->SetInteger(kConnectionIdKey, -1);
|
| - result_.reset(result);
|
| + SetSingleResult(result);
|
| AsyncWorkCompleted();
|
| }
|
| }
|
| @@ -116,7 +116,7 @@ void SerialCloseFunction::Work() {
|
| close_result = true;
|
| }
|
|
|
| - result_.reset(Value::CreateBooleanValue(close_result));
|
| + SetSingleResult(Value::CreateBooleanValue(close_result));
|
| }
|
|
|
| bool SerialCloseFunction::Respond() {
|
| @@ -147,7 +147,7 @@ void SerialReadFunction::Work() {
|
| result->SetInteger(kBytesReadKey, bytes_read);
|
| result->Set(kDataKey, base::BinaryValue::CreateWithCopiedBuffer(
|
| reinterpret_cast<char*>(&byte), bytes_read));
|
| - result_.reset(result);
|
| + SetSingleResult(result);
|
| }
|
|
|
| bool SerialReadFunction::Respond() {
|
| @@ -184,7 +184,7 @@ void SerialWriteFunction::Work() {
|
|
|
| DictionaryValue* result = new DictionaryValue();
|
| result->SetInteger(kBytesWrittenKey, bytes_written);
|
| - result_.reset(result);
|
| + SetSingleResult(result);
|
| }
|
|
|
| bool SerialWriteFunction::Respond() {
|
| @@ -207,7 +207,7 @@ void SerialFlushFunction::Work() {
|
| flush_result = true;
|
| }
|
|
|
| - result_.reset(Value::CreateBooleanValue(flush_result));
|
| + SetSingleResult(Value::CreateBooleanValue(flush_result));
|
| }
|
|
|
| bool SerialFlushFunction::Respond() {
|
|
|