Index: chrome/browser/extensions/menu_manager.cc |
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc |
index e70a3153d80b1bc38acead280b86dd3da52e9135..606183d0c3ce2d7c9d2978ee0039f7328c068d12 100644 |
--- a/chrome/browser/extensions/menu_manager.cc |
+++ b/chrome/browser/extensions/menu_manager.cc |
@@ -6,6 +6,7 @@ |
#include <algorithm> |
#include <tuple> |
+#include <utility> |
#include "base/json/json_writer.h" |
#include "base/logging.h" |
@@ -214,7 +215,7 @@ scoped_ptr<base::DictionaryValue> MenuItem::ToValue() const { |
value->Set(kDocumentURLPatternsKey, |
document_url_patterns_.ToValue().release()); |
value->Set(kTargetURLPatternsKey, target_url_patterns_.ToValue().release()); |
- return value.Pass(); |
+ return value; |
} |
// static |
@@ -718,7 +719,8 @@ void MenuManager::ExecuteCommand(content::BrowserContext* context, |
scoped_ptr<base::ListValue>(args->DeepCopy()))); |
event->restrict_to_browser_context = context; |
event->user_gesture = EventRouter::USER_GESTURE_ENABLED; |
- event_router->DispatchEventToExtension(item->extension_id(), event.Pass()); |
+ event_router->DispatchEventToExtension(item->extension_id(), |
+ std::move(event)); |
} |
{ |
// Dispatch to .contextMenus.onClicked handler. |
@@ -727,12 +729,13 @@ void MenuManager::ExecuteCommand(content::BrowserContext* context, |
: events::CONTEXT_MENUS_ON_CLICKED, |
webview_guest ? api::chrome_web_view_internal::OnClicked::kEventName |
: api::context_menus::OnClicked::kEventName, |
- args.Pass())); |
+ std::move(args))); |
event->restrict_to_browser_context = context; |
event->user_gesture = EventRouter::USER_GESTURE_ENABLED; |
if (webview_guest) |
event->filter_info.SetInstanceID(webview_guest->view_instance_id()); |
- event_router->DispatchEventToExtension(item->extension_id(), event.Pass()); |
+ event_router->DispatchEventToExtension(item->extension_id(), |
+ std::move(event)); |
} |
} |