Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: chrome/browser/extensions/api/mdns/mdns_api.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 477b11b5cb44879381c345206c838d823369b216..20c6610cfda357582f88a0fb9615725c21225e60 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/mdns/mdns_api.h"
+#include <utility>
#include <vector>
#include "base/lazy_instance.h"
@@ -63,7 +64,7 @@ BrowserContextKeyedAPIFactory<MDnsAPI>* MDnsAPI::GetFactoryInstance() {
void MDnsAPI::SetDnsSdRegistryForTesting(
scoped_ptr<DnsSdRegistry> dns_sd_registry) {
- dns_sd_registry_ = dns_sd_registry.Pass();
+ dns_sd_registry_ = std::move(dns_sd_registry);
if (dns_sd_registry_.get())
dns_sd_registry_.get()->AddObserver(this);
}
@@ -174,7 +175,7 @@ void MDnsAPI::OnDnsSdEvent(const std::string& service_type,
scoped_ptr<base::ListValue> results = mdns::OnServiceList::Create(args);
scoped_ptr<Event> event(new Event(events::MDNS_ON_SERVICE_LIST,
mdns::OnServiceList::kEventName,
- results.Pass()));
+ std::move(results)));
event->restrict_to_browser_context = browser_context_;
event->filter_info.SetServiceType(service_type);
@@ -182,7 +183,8 @@ void MDnsAPI::OnDnsSdEvent(const std::string& service_type,
// events, modify API to have this event require filters.
// TODO(reddaly): If event isn't on whitelist, ensure it does not get
// broadcast to extensions.
- extensions::EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());
+ extensions::EventRouter::Get(browser_context_)
+ ->BroadcastEvent(std::move(event));
}
const extensions::EventListenerMap::ListenerList& MDnsAPI::GetEventListeners() {
« no previous file with comments | « chrome/browser/extensions/api/mdns/dns_sd_registry.cc ('k') | chrome/browser/extensions/api/mdns/mdns_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698