| 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 940ec5ed859c1eac3bc0506827afa16f24d2afc1..02fbe8d8ebcbf66a85ae445833866378f3cd2487 100644
|
| --- a/chrome/browser/extensions/api/serial/serial_api.cc
|
| +++ b/chrome/browser/extensions/api/serial/serial_api.cc
|
| @@ -39,7 +39,7 @@ void SerialGetPortsFunction::Work() {
|
| ports->Append(Value::CreateStringValue(*i++));
|
| }
|
|
|
| - result_.reset(ports);
|
| + SetSingleResult(ports);
|
| }
|
|
|
| bool SerialGetPortsFunction::Respond() {
|
| @@ -106,12 +106,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();
|
| }
|
| }
|
| @@ -144,7 +144,7 @@ void SerialCloseFunction::Work() {
|
| close_result = true;
|
| }
|
|
|
| - result_.reset(Value::CreateBooleanValue(close_result));
|
| + SetSingleResult(Value::CreateBooleanValue(close_result));
|
| }
|
|
|
| bool SerialCloseFunction::Respond() {
|
| @@ -182,7 +182,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() {
|
| @@ -219,7 +219,7 @@ void SerialWriteFunction::Work() {
|
|
|
| DictionaryValue* result = new DictionaryValue();
|
| result->SetInteger(kBytesWrittenKey, bytes_written);
|
| - result_.reset(result);
|
| + SetSingleResult(result);
|
| }
|
|
|
| bool SerialWriteFunction::Respond() {
|
| @@ -249,7 +249,7 @@ void SerialFlushFunction::Work() {
|
| flush_result = true;
|
| }
|
|
|
| - result_.reset(Value::CreateBooleanValue(flush_result));
|
| + SetSingleResult(Value::CreateBooleanValue(flush_result));
|
| }
|
|
|
| bool SerialFlushFunction::Respond() {
|
|
|