| Index: chrome/browser/extensions/event_router_forwarder_unittest.cc
|
| diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
|
| index 24e76fe27f0af7787d3ee00db109216ddcab9154..2ca555e98d5e03a5e3033c20f92dda8d01580642 100644
|
| --- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
|
| +++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/extensions/event_router_forwarder.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/bind.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/power_monitor/power_monitor.h"
|
| @@ -61,7 +63,7 @@ static void BroadcastEventToRenderers(EventRouterForwarder* event_router,
|
| const GURL& url) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| event_router->BroadcastEventToRenderers(histogram_value, event_name,
|
| - args.Pass(), url);
|
| + std::move(args), url);
|
| }
|
|
|
| static void DispatchEventToRenderers(EventRouterForwarder* event_router,
|
| @@ -72,7 +74,7 @@ static void DispatchEventToRenderers(EventRouterForwarder* event_router,
|
| const GURL& url) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| event_router->DispatchEventToRenderers(histogram_value, event_name,
|
| - args.Pass(), profile,
|
| + std::move(args), profile,
|
| use_profile_to_restrict_events, url);
|
| }
|
|
|
| @@ -83,7 +85,7 @@ static void BroadcastEventToExtension(EventRouterForwarder* event_router,
|
| const GURL& url) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| event_router->BroadcastEventToExtension(extension, histogram_value,
|
| - event_name, args.Pass(), url);
|
| + event_name, std::move(args), url);
|
| }
|
|
|
| static void DispatchEventToExtension(EventRouterForwarder* event_router,
|
| @@ -95,7 +97,7 @@ static void DispatchEventToExtension(EventRouterForwarder* event_router,
|
| const GURL& url) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| event_router->DispatchEventToExtension(extension, histogram_value, event_name,
|
| - args.Pass(), profile,
|
| + std::move(args), profile,
|
| use_profile_to_restrict_events, url);
|
| }
|
|
|
| @@ -112,7 +114,7 @@ class EventRouterForwarderTest : public testing::Test {
|
| #endif
|
| scoped_ptr<base::PowerMonitorSource> power_monitor_source(
|
| new base::PowerMonitorDeviceSource());
|
| - dummy.reset(new base::PowerMonitor(power_monitor_source.Pass()));
|
| + dummy.reset(new base::PowerMonitor(std::move(power_monitor_source)));
|
| }
|
|
|
| void SetUp() override {
|
|
|