| Index: chrome/browser/extensions/event_router_forwarder.cc
|
| diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc
|
| index b92ce903bd4016dcecd89e5e72c1a4a0b75f0463..dd31a783b5b56b0fe5b87aa5282fdd3ac73e0f45 100644
|
| --- a/chrome/browser/extensions/event_router_forwarder.cc
|
| +++ b/chrome/browser/extensions/event_router_forwarder.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/extensions/event_router_forwarder.h"
|
|
|
| #include <stddef.h>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/values.h"
|
| @@ -30,8 +31,8 @@ void EventRouterForwarder::BroadcastEventToRenderers(
|
| const std::string& event_name,
|
| scoped_ptr<base::ListValue> event_args,
|
| const GURL& event_url) {
|
| - HandleEvent(std::string(), histogram_value, event_name, event_args.Pass(), 0,
|
| - true, event_url);
|
| + HandleEvent(std::string(), histogram_value, event_name, std::move(event_args),
|
| + 0, true, event_url);
|
| }
|
|
|
| void EventRouterForwarder::DispatchEventToRenderers(
|
| @@ -43,7 +44,7 @@ void EventRouterForwarder::DispatchEventToRenderers(
|
| const GURL& event_url) {
|
| if (!profile)
|
| return;
|
| - HandleEvent(std::string(), histogram_value, event_name, event_args.Pass(),
|
| + HandleEvent(std::string(), histogram_value, event_name, std::move(event_args),
|
| profile, use_profile_to_restrict_events, event_url);
|
| }
|
|
|
| @@ -53,8 +54,8 @@ void EventRouterForwarder::BroadcastEventToExtension(
|
| const std::string& event_name,
|
| scoped_ptr<base::ListValue> event_args,
|
| const GURL& event_url) {
|
| - HandleEvent(extension_id, histogram_value, event_name, event_args.Pass(), 0,
|
| - true, event_url);
|
| + HandleEvent(extension_id, histogram_value, event_name, std::move(event_args),
|
| + 0, true, event_url);
|
| }
|
|
|
| void EventRouterForwarder::DispatchEventToExtension(
|
| @@ -67,7 +68,7 @@ void EventRouterForwarder::DispatchEventToExtension(
|
| const GURL& event_url) {
|
| if (!profile)
|
| return;
|
| - HandleEvent(extension_id, histogram_value, event_name, event_args.Pass(),
|
| + HandleEvent(extension_id, histogram_value, event_name, std::move(event_args),
|
| profile, use_profile_to_restrict_events, event_url);
|
| }
|
|
|
| @@ -99,7 +100,7 @@ void EventRouterForwarder::HandleEvent(const std::string& extension_id,
|
| }
|
| if (profile) {
|
| CallEventRouter(profile, extension_id, histogram_value, event_name,
|
| - event_args.Pass(),
|
| + std::move(event_args),
|
| use_profile_to_restrict_events ? profile : NULL, event_url);
|
| } else {
|
| std::vector<Profile*> profiles(profile_manager->GetLoadedProfiles());
|
| @@ -107,7 +108,7 @@ void EventRouterForwarder::HandleEvent(const std::string& extension_id,
|
| scoped_ptr<base::ListValue> per_profile_event_args(
|
| event_args->DeepCopy());
|
| CallEventRouter(profiles[i], extension_id, histogram_value, event_name,
|
| - per_profile_event_args.Pass(),
|
| + std::move(per_profile_event_args),
|
| use_profile_to_restrict_events ? profiles[i] : NULL,
|
| event_url);
|
| }
|
| @@ -131,14 +132,14 @@ void EventRouterForwarder::CallEventRouter(
|
| #endif
|
|
|
| scoped_ptr<Event> event(
|
| - new Event(histogram_value, event_name, event_args.Pass()));
|
| + new Event(histogram_value, event_name, std::move(event_args)));
|
| event->restrict_to_browser_context = restrict_to_profile;
|
| event->event_url = event_url;
|
| if (extension_id.empty()) {
|
| - extensions::EventRouter::Get(profile)->BroadcastEvent(event.Pass());
|
| + extensions::EventRouter::Get(profile)->BroadcastEvent(std::move(event));
|
| } else {
|
| extensions::EventRouter::Get(profile)
|
| - ->DispatchEventToExtension(extension_id, event.Pass());
|
| + ->DispatchEventToExtension(extension_id, std::move(event));
|
| }
|
| }
|
|
|
|
|