| Index: chrome/browser/extensions/api/mdns/mdns_api.cc
|
| diff --git a/chrome/browser/extensions/api/mdns/mdns_api.cc b/chrome/browser/extensions/api/mdns/mdns_api.cc
|
| index 20c6610cfda357582f88a0fb9615725c21225e60..50bab5fd62b4c7d135af9c3b3db4ee4b7c9edb6c 100644
|
| --- a/chrome/browser/extensions/api/mdns/mdns_api.cc
|
| +++ b/chrome/browser/extensions/api/mdns/mdns_api.cc
|
| @@ -144,9 +144,8 @@ void MDnsAPI::OnDnsSdEvent(const std::string& service_type,
|
| const DnsSdRegistry::DnsSdServiceList& services) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| - std::vector<linked_ptr<mdns::MDnsService> > args;
|
| - for (DnsSdRegistry::DnsSdServiceList::const_iterator it = services.begin();
|
| - it != services.end(); ++it) {
|
| + std::vector<mdns::MDnsService> args;
|
| + for (const DnsSdService& service : services) {
|
| if (static_cast<int>(args.size()) ==
|
| api::mdns::MAX_SERVICE_INSTANCES_PER_EVENT) {
|
| // TODO(reddaly): This is not the most meaningful way of notifying the
|
| @@ -163,13 +162,12 @@ void MDnsAPI::OnDnsSdEvent(const std::string& service_type,
|
| api::mdns::MAX_SERVICE_INSTANCES_PER_EVENT));
|
| break;
|
| }
|
| - linked_ptr<mdns::MDnsService> mdns_service =
|
| - make_linked_ptr(new mdns::MDnsService);
|
| - mdns_service->service_name = (*it).service_name;
|
| - mdns_service->service_host_port = (*it).service_host_port;
|
| - mdns_service->ip_address = (*it).ip_address;
|
| - mdns_service->service_data = (*it).service_data;
|
| - args.push_back(mdns_service);
|
| + mdns::MDnsService mdns_service;
|
| + mdns_service.service_name = service.service_name;
|
| + mdns_service.service_host_port = service.service_host_port;
|
| + mdns_service.ip_address = service.ip_address;
|
| + mdns_service.service_data = service.service_data;
|
| + args.push_back(std::move(mdns_service));
|
| }
|
|
|
| scoped_ptr<base::ListValue> results = mdns::OnServiceList::Create(args);
|
|
|