Commit d2372c3d authored by Marshall Greenblatt's avatar Marshall Greenblatt

Update to Chromium revision d7d5682a (#367535)

parent 12f19e3a
......@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'c78c0ad7cca1b37761b488e9499d619b21c8016d',
'chromium_checkout': 'd7d5682a0953188e49a31505303665ff916c1080',
}
......@@ -1382,6 +1382,8 @@
'<(DEPTH)/chrome/browser/plugins/plugin_finder.h',
'<(DEPTH)/chrome/browser/plugins/plugin_metadata.cc',
'<(DEPTH)/chrome/browser/plugins/plugin_metadata.h',
'<(DEPTH)/chrome/renderer/plugins/power_saver_info.cc',
'<(DEPTH)/chrome/renderer/plugins/power_saver_info.h',
'<(DEPTH)/components/nacl/common/nacl_constants.cc',
'<(DEPTH)/components/nacl/common/nacl_constants.h',
# Include sources for preferences support.
......@@ -1425,8 +1427,13 @@
'libcef/browser/native/file_dialog_runner_win.h',
'libcef/browser/native/javascript_dialog_runner_win.cc',
'libcef/browser/native/javascript_dialog_runner_win.h',
'libcef/browser/native/menu_2.cc',
'libcef/browser/native/menu_2.h',
'libcef/browser/native/menu_runner_win.cc',
'libcef/browser/native/menu_runner_win.h',
'libcef/browser/native/menu_wrapper.h',
'libcef/browser/native/native_menu_win.cc',
'libcef/browser/native/native_menu_win.h',
'libcef/browser/osr/browser_platform_delegate_osr_win.cc',
'libcef/browser/osr/browser_platform_delegate_osr_win.h',
'libcef/browser/osr/render_widget_host_view_osr_win.cc',
......
......@@ -32,14 +32,6 @@
#define CEF_INCLUDE_BASE_CEF_BASICTYPES_H_
#pragma once
#if defined(BUILDING_CEF_SHARED)
// When building CEF include the Chromium header directly.
#include "base/basictypes.h"
#else // !BUILDING_CEF_SHARED
// The following is substantially similar to the Chromium implementation.
// If the Chromium implementation diverges the below implementation should be
// updated to match.
#include <limits.h> // For UINT_MAX
#include <stddef.h> // For size_t
......@@ -72,8 +64,6 @@ typedef int int32;
typedef unsigned int uint32;
#endif
#endif // !BUILDING_CEF_SHARED
// UTF-16 character type.
// This should be kept synchronized with base/strings/string16.h
#ifndef char16
......
......@@ -135,7 +135,7 @@
// Annotate a function indicating the caller must examine the return value.
// Use like:
// int foo() WARN_UNUSED_RESULT;
// To explicitly ignore a result, see |ignore_result()| in <base/basictypes.h>.
// To explicitly ignore a result, see |ignore_result()| in <base/macros.h>.
#ifndef WARN_UNUSED_RESULT
#if defined(COMPILER_GCC)
#define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
......
......@@ -5,6 +5,7 @@
#include "libcef/browser/browser_context_impl.h"
#include <map>
#include <utility>
#include "libcef/browser/browser_context_proxy.h"
#include "libcef/browser/context.h"
......@@ -368,8 +369,8 @@ net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
protocol_handlers,
proxy_config_service.Pass(),
request_interceptors.Pass());
std::move(proxy_config_service),
std::move(request_interceptors));
resource_context()->set_url_request_context_getter(url_request_getter_.get());
return url_request_getter_.get();
}
......
......@@ -293,7 +293,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::Create(
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::CreateInternal(settings, client, NULL, info, opener,
request_context,
platform_delegate.Pass());
std::move(platform_delegate));
if (browser.get() && !url.empty()) {
browser->LoadURL(CefFrameHostImpl::kMainFrameId, url, content::Referrer(),
ui::PAGE_TRANSITION_TYPED, std::string());
......@@ -343,7 +343,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::CreateInternal(
CefRefPtr<CefBrowserHostImpl> browser =
new CefBrowserHostImpl(settings, client, web_contents, browser_info,
opener, request_context,
platform_delegate.Pass());
std::move(platform_delegate));
if (!browser->CreateHostWindow())
return nullptr;
......@@ -654,7 +654,7 @@ void CefBrowserHostImpl::StartDownload(const CefString& url) {
scoped_ptr<content::DownloadUrlParameters> params(
content::DownloadUrlParameters::FromWebContents(web_contents(), gurl));
manager->DownloadUrl(params.Pass());
manager->DownloadUrl(std::move(params));
}
void CefBrowserHostImpl::Print() {
......@@ -1947,9 +1947,9 @@ void CefBrowserHostImpl::UpdateTargetURL(content::WebContents* source,
}
bool CefBrowserHostImpl::AddMessageToConsole(content::WebContents* source,
int32 level,
int32_t level,
const base::string16& message,
int32 line_no,
int32_t line_no,
const base::string16& source_id) {
if (client_.get()) {
CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
......@@ -2118,7 +2118,7 @@ void CefBrowserHostImpl::WebContentsCreated(
CefRefPtr<CefBrowserHostImpl> browser = CefBrowserHostImpl::CreateInternal(
settings, client, new_contents, info, opener, request_context,
platform_delegate.Pass());
std::move(platform_delegate));
}
void CefBrowserHostImpl::DidNavigateMainFramePostCommit(
......@@ -2133,7 +2133,7 @@ content::JavaScriptDialogManager*
if (!javascript_dialog_manager_.get()) {
javascript_dialog_manager_.reset(
new CefJavaScriptDialogManager(this,
platform_delegate_->CreateJavaScriptDialogRunner().Pass()));
platform_delegate_->CreateJavaScriptDialogRunner()));
}
return javascript_dialog_manager_.get();
}
......@@ -2152,7 +2152,7 @@ bool CefBrowserHostImpl::HandleContextMenu(
if (!menu_manager_.get()) {
menu_manager_.reset(
new CefMenuManager(this,
platform_delegate_->CreateMenuRunner().Pass()));
platform_delegate_->CreateMenuRunner()));
}
return menu_manager_->CreateContextMenu(params);
}
......@@ -2606,7 +2606,7 @@ CefBrowserHostImpl::CefBrowserHostImpl(
browser_info_(browser_info),
opener_(kNullWindowHandle),
request_context_(request_context),
platform_delegate_(platform_delegate.Pass()),
platform_delegate_(std::move(platform_delegate)),
is_loading_(false),
can_go_back_(false),
can_go_forward_(false),
......@@ -2871,6 +2871,6 @@ void CefBrowserHostImpl::EnsureFileDialogManager() {
if (!file_dialog_manager_.get()) {
file_dialog_manager_.reset(
new CefFileDialogManager(this,
platform_delegate_->CreateFileDialogRunner().Pass()));
platform_delegate_->CreateFileDialogRunner()));
}
}
......@@ -304,9 +304,9 @@ class CefBrowserHostImpl : public CefBrowserHost,
void UpdateTargetURL(content::WebContents* source,
const GURL& url) override;
bool AddMessageToConsole(content::WebContents* source,
int32 level,
int32_t level,
const base::string16& message,
int32 line_no,
int32_t line_no,
const base::string16& source_id) override;
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
......
......@@ -4,6 +4,8 @@
#include "libcef/browser/browser_info_manager.h"
#include <utility>
#include "libcef/browser/browser_platform_delegate.h"
#include "libcef/browser/browser_host_impl.h"
#include "libcef/browser/thread_util.h"
......@@ -148,7 +150,7 @@ void CefBrowserInfoManager::OnCreateWindow(
pending_popup->opener_frame_id = params.opener_render_frame_id;
pending_popup->target_url = params.target_url;
pending_popup->target_frame_name = params.frame_name;
PushPendingPopup(pending_popup.Pass());
PushPendingPopup(std::move(pending_popup));
}
bool CefBrowserInfoManager::CanCreateWindow(
......@@ -282,7 +284,7 @@ void CefBrowserInfoManager::ShouldCreateWebContents(
pending_popup->step =
CefBrowserInfoManager::PendingPopup::SHOULD_CREATE_WEB_CONTENTS;
PushPendingPopup(pending_popup.Pass());
PushPendingPopup(std::move(pending_popup));
}
void CefBrowserInfoManager::WebContentsCreated(
......@@ -306,7 +308,7 @@ void CefBrowserInfoManager::WebContentsCreated(
settings = pending_popup->settings;
client = pending_popup->client;
platform_delegate = pending_popup->platform_delegate.Pass();
platform_delegate = std::move(pending_popup->platform_delegate);
}
void CefBrowserInfoManager::OnGetNewBrowserInfo(
......@@ -358,7 +360,7 @@ void CefBrowserInfoManager::OnGetNewBrowserInfo(
pending->render_view_routing_id = render_view_routing_id;
pending->render_frame_routing_id = render_frame_routing_id;
pending->reply_msg = reply_msg;
pending_new_browser_info_list_.push_back(pending.Pass());
pending_new_browser_info_list_.push_back(std::move(pending));
}
void CefBrowserInfoManager::RemoveBrowserInfo(
......@@ -448,12 +450,12 @@ void CefBrowserInfoManager::FilterPendingPopupURL(
DCHECK(rph);
rph->FilterURL(false, &pending_popup->target_url);
GetInstance()->PushPendingPopup(pending_popup.Pass());
GetInstance()->PushPendingPopup(std::move(pending_popup));
}
void CefBrowserInfoManager::PushPendingPopup(scoped_ptr<PendingPopup> popup) {
base::AutoLock lock_scope(pending_popup_lock_);
pending_popup_list_.push_back(popup.Pass());
pending_popup_list_.push_back(std::move(popup));
}
scoped_ptr<CefBrowserInfoManager::PendingPopup>
......
......@@ -4,6 +4,8 @@
#include "libcef/browser/browser_main.h"
#include <stdint.h>
#include <string>
#include "libcef/browser/browser_context_impl.h"
......@@ -155,7 +157,7 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
int port;
if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
devtools_delegate_ =
new CefDevToolsDelegate(static_cast<uint16>(port));
new CefDevToolsDelegate(static_cast<uint16_t>(port));
} else {
LOG(WARNING) << "Invalid http debugger port number " << port;
}
......
......@@ -9,11 +9,12 @@
#include "libcef/browser/browser_context_impl.h"
#include "libcef/browser/net/url_request_context_getter_impl.h"
#include "base/basictypes.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/prefs/pref_service.h"
#include "base/strings/string_piece.h"
#include "build/build_config.h"
#include "content/public/browser/browser_main_parts.h"
#include "net/url_request/url_request_context_getter.h"
......
......@@ -103,7 +103,7 @@ void CefBrowserMessageFilter::OnCreateWindow(
delete reply_msg;
}
void CefBrowserMessageFilter::OnFrameFocused(int32 render_frame_routing_id) {
void CefBrowserMessageFilter::OnFrameFocused(int32_t render_frame_routing_id) {
if (!CEF_CURRENTLY_ON_UIT()) {
CEF_POST_TASK(CEF_UIT,
base::Bind(&CefBrowserMessageFilter::OnFrameFocused, this,
......
......@@ -6,7 +6,10 @@
#ifndef CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_FILTER_H_
#define CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_FILTER_H_
#include <stdint.h>
#include <string>
#include "ipc/ipc_channel_proxy.h"
#include "ipc/message_filter.h"
......@@ -41,7 +44,7 @@ class CefBrowserMessageFilter : public IPC::MessageFilter {
IPC::Message* reply_msg);
void OnCreateWindow(const ViewHostMsg_CreateWindow_Params& params,
IPC::Message* reply_msg);
void OnFrameFocused(int32 render_frame_routing_id);
void OnFrameFocused(int32_t render_frame_routing_id);
content::RenderProcessHost* host_;
IPC::Sender* sender_;
......
......@@ -6,7 +6,7 @@
#define CEF_LIBCEF_BROWSER_BROWSER_MESSAGE_LOOP_H_
#pragma once
#include "base/basictypes.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
// Class used to process events on the current message loop.
......
......@@ -4,6 +4,10 @@
#include "libcef/browser/browser_platform_delegate.h"
#include <utility>
#include "build/build_config.h"
#if defined(OS_WIN)
#include "libcef/browser/native/browser_platform_delegate_native_win.h"
#include "libcef/browser/osr/browser_platform_delegate_osr_win.h"
......@@ -35,13 +39,13 @@ scoped_ptr<CefBrowserPlatformDelegateOsr> CreateOSRDelegate(
scoped_ptr<CefBrowserPlatformDelegateNative> native_delegate) {
#if defined(OS_WIN)
return make_scoped_ptr(
new CefBrowserPlatformDelegateOsrWin(native_delegate.Pass()));
new CefBrowserPlatformDelegateOsrWin(std::move(native_delegate)));
#elif defined(OS_MACOSX)
return make_scoped_ptr(
new CefBrowserPlatformDelegateOsrMac(native_delegate.Pass()));
new CefBrowserPlatformDelegateOsrMac(std::move(native_delegate)));
#elif defined(OS_LINUX)
return make_scoped_ptr(
new CefBrowserPlatformDelegateOsrLinux(native_delegate.Pass()));
new CefBrowserPlatformDelegateOsrLinux(std::move(native_delegate)));
#endif
}
......@@ -56,7 +60,7 @@ scoped_ptr<CefBrowserPlatformDelegate> CefBrowserPlatformDelegate::Create(
CreateNativeDelegate(window_info);
if (window_info.windowless_rendering_enabled &&
client->GetRenderHandler().get()) {
return CreateOSRDelegate(native_delegate.Pass());
return CreateOSRDelegate(std::move(native_delegate));
}
return native_delegate.Pass();
return std::move(native_delegate);
}
......@@ -5,6 +5,7 @@
#include "libcef/browser/browser_urlrequest_impl.h"
#include <string>
#include <utility>
#include "libcef/browser/browser_context.h"
#include "libcef/browser/content_browser_client.h"
......@@ -228,7 +229,7 @@ class CefBrowserURLRequest::Context
response_writer.reset(
new CefURLFetcherResponseWriter(url_request_, task_runner_));
}
fetcher_->SaveResponseWithWriter(response_writer.Pass());
fetcher_->SaveResponseWithWriter(std::move(response_writer));
fetcher_->Start();
}
......
......@@ -129,7 +129,7 @@ GpuModeManager* ChromeBrowserProcessStub::gpu_mode_manager() {
void ChromeBrowserProcessStub::CreateDevToolsHttpProtocolHandler(
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
uint16 port) {
uint16_t port) {
}
unsigned int ChromeBrowserProcessStub::AddRefModule() {
......
......@@ -55,7 +55,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
void CreateDevToolsHttpProtocolHandler(
chrome::HostDesktopType host_desktop_type,
const std::string& ip,
uint16 port) override;
uint16_t port) override;
unsigned int AddRefModule() override;
unsigned int ReleaseModule() override;
bool IsShuttingDown() override;
......
......@@ -5,6 +5,7 @@
#include "libcef/browser/content_browser_client.h"
#include <algorithm>
#include <utility>
#include "libcef/browser/browser_info.h"
#include "libcef/browser/browser_info_manager.h"
......@@ -515,7 +516,7 @@ net::URLRequestContextGetter* CefContentBrowserClient::CreateRequestContext(
return context->CreateRequestContext(
protocol_handlers,
request_interceptors.Pass());
std::move(request_interceptors));
}
net::URLRequestContextGetter*
......@@ -531,7 +532,7 @@ CefContentBrowserClient::CreateRequestContextForStoragePartition(
partition_path,
in_memory,
protocol_handlers,
request_interceptors.Pass());
std::move(request_interceptors));
}
bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
......@@ -847,7 +848,7 @@ CefContentBrowserClient::CreateThrottlesForNavigation(
true);
throttles.push_back(throttle);
return throttles.Pass();
return throttles;
}
#if defined(OS_POSIX) && !defined(OS_MACOSX)
......
......@@ -13,9 +13,10 @@
#include "libcef/browser/browser_context_impl.h"
#include "libcef/browser/net/url_request_context_getter_impl.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "content/public/browser/content_browser_client.h"
#include "third_party/skia/include/core/SkColor.h"
......
......@@ -3,12 +3,13 @@
// governed by a BSD-style license that can be found in the LICENSE file.
#include "libcef/browser/devtools_delegate.h"
#include "libcef/browser/net/devtools_scheme_handler.h"
#include "libcef/common/content_client.h"
#include <algorithm>
#include <string>
#include "libcef/browser/net/devtools_scheme_handler.h"
#include "libcef/common/content_client.h"
#include "base/command_line.h"
#include "base/md5.h"
#include "base/rand_util.h"
......@@ -41,7 +42,7 @@ const int kBackLog = 10;
class TCPServerSocketFactory
: public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory {
public:
TCPServerSocketFactory(const std::string& address, uint16 port)
TCPServerSocketFactory(const std::string& address, uint16_t port)
: address_(address), port_(port) {
}
......@@ -57,13 +58,13 @@ class TCPServerSocketFactory
}
std::string address_;
uint16 port_;
uint16_t port_;
DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
};
scoped_ptr<devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory>
CreateSocketFactory(uint16 port) {
CreateSocketFactory(uint16_t port) {
return scoped_ptr<
devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory>(
new TCPServerSocketFactory("127.0.0.1", port));
......@@ -73,7 +74,7 @@ scoped_ptr<devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory>
// CefDevToolsDelegate
CefDevToolsDelegate::CefDevToolsDelegate(uint16 port) {
CefDevToolsDelegate::CefDevToolsDelegate(uint16_t port) {
devtools_http_handler_.reset(new devtools_http_handler::DevToolsHttpHandler(
CreateSocketFactory(port),
std::string(),
......
......@@ -6,10 +6,11 @@
#define CEF_LIBCEF_BROWSER_DEVTOOLS_DELEGATE_H_
#pragma once
#include <stdint.h>
#include <map>
#include <vector>
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "components/devtools_http_handler/devtools_http_handler.h"
......@@ -24,7 +25,7 @@ class RenderViewHost;
class CefDevToolsDelegate :
public devtools_http_handler::DevToolsHttpHandlerDelegate {
public:
explicit CefDevToolsDelegate(uint16 port);
explicit CefDevToolsDelegate(uint16_t port);
~CefDevToolsDelegate() override;
// Stops http server.
......
......@@ -7,7 +7,6 @@
#include "libcef/browser/browser_host_impl.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
......
......@@ -4,6 +4,9 @@
#include "libcef/browser/extensions/api/streams_private/streams_private_api.h"
#include <limits.h>
#include <utility>
#include "base/lazy_instance.h"
#include "base/values.h"
#include "cef/libcef/common/extensions/api/streams_private.h"
......@@ -64,7 +67,7 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
int tab_id,
scoped_ptr<content::StreamInfo> stream,
const std::string& view_id,
int64 expected_content_size,
int64_t expected_content_size,
bool embedded,
int render_process_id,
int render_frame_id) {
......@@ -82,9 +85,9 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
GURL handler_url(Extension::GetBaseURLFromExtensionId(extension_id).spec() +
handler->handler_url());
scoped_ptr<StreamContainer> stream_container(new StreamContainer(
stream.Pass(), tab_id, embedded, handler_url, extension_id));
std::move(stream), tab_id, embedded, handler_url, extension_id));
MimeHandlerStreamManager::Get(browser_context_)
->AddStream(view_id, stream_container.Pass(), render_process_id,
->AddStream(view_id, std::move(stream_container), render_process_id,
render_frame_id);
return;
}
......@@ -114,7 +117,7 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
streams_private::OnExecuteMimeTypeHandler::Create(info)));
EventRouter::Get(browser_context_)
->DispatchEventToExtension(extension_id, event.Pass());
->DispatchEventToExtension(extension_id, std::move(event));
GURL url = stream->handle->GetURL();
streams_[extension_id][url] = make_linked_ptr(stream->handle.release());
......
......@@ -5,6 +5,8 @@
#ifndef CEF_LIBCEF_BROWSER_EXTENSIONS_API_STREAMS_PRIVATE_STREAMS_PRIVATE_API_H_
#define CEF_LIBCEF_BROWSER_EXTENSIONS_API_STREAMS_PRIVATE_STREAMS_PRIVATE_API_H_
#include <stdint.h>
#include <map>
#include <string>
......@@ -41,7 +43,7 @@ class StreamsPrivateAPI : public BrowserContextKeyedAPI,
int tab_id,
scoped_ptr<content::StreamInfo> stream,
const std::string& view_id,
int64 expected_content_size,
int64_t expected_content_size,
bool embedded,
int render_process_id,
int render_frame_id);
......
......@@ -7,7 +7,6 @@
#include <map>
#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "extensions/browser/component_extension_resource_manager.h"
......
......@@ -4,10 +4,14 @@
#include "libcef/browser/extensions/event_router_forwarder.h"
#include <stddef.h>
#include <utility>
#include "libcef/browser/browser_context_impl.h"
#include "base/bind.h"
#include "base/values.h"
#include "build/build_config.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/event_router.h"
#include "url/gurl.h"
......@@ -27,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(
......@@ -40,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);
}
......@@ -50,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(
......@@ -64,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);
}
......@@ -92,7 +96,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<CefBrowserContextImpl*> profiles(
......@@ -101,7 +105,7 @@ void EventRouterForwarder::HandleEvent(const std::string& extension_id,