| Index: chrome/browser/extensions/api/messaging/message_service.cc
|
| diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc
|
| index aae6a25d8958dfdf771a389f45dd9fcda4e8c331..e3075f9eb6672a06da1ca3aa71a9f85bd97658f6 100644
|
| --- a/chrome/browser/extensions/api/messaging/message_service.cc
|
| +++ b/chrome/browser/extensions/api/messaging/message_service.cc
|
| @@ -216,7 +216,7 @@ void MessageService::OpenChannelToNativeApp(
|
| }
|
|
|
| if (!has_permission) {
|
| - ExtensionMessagePort port(source, MSG_ROUTING_CONTROL, "");
|
| + ExtensionMessagePort port(source, MSG_ROUTING_CONTROL, std::string());
|
| port.DispatchOnDisconnect(GET_OPPOSITE_PORT_ID(receiver_port_id),
|
| kMissingPermissionError);
|
| return;
|
| @@ -247,7 +247,7 @@ void MessageService::OpenChannelToNativeApp(
|
| if (!native_process.get()) {
|
| LOG(ERROR) << "Failed to create native process.";
|
| // Treat it as a disconnect.
|
| - ExtensionMessagePort port(source, MSG_ROUTING_CONTROL, "");
|
| + ExtensionMessagePort port(source, MSG_ROUTING_CONTROL, std::string());
|
| port.DispatchOnDisconnect(GET_OPPOSITE_PORT_ID(receiver_port_id),
|
| kReceivingEndDoesntExistError);
|
| return;
|
| @@ -320,7 +320,8 @@ bool MessageService::OpenChannelImpl(scoped_ptr<OpenChannelParams> params) {
|
|
|
| if (!params->receiver.get() || !params->receiver->GetRenderProcessHost()) {
|
| // Treat it as a disconnect.
|
| - ExtensionMessagePort port(params->source, MSG_ROUTING_CONTROL, "");
|
| + ExtensionMessagePort port(
|
| + params->source, MSG_ROUTING_CONTROL, std::string());
|
| port.DispatchOnDisconnect(GET_OPPOSITE_PORT_ID(params->receiver_port_id),
|
| kReceivingEndDoesntExistError);
|
| return false;
|
|
|