| Index: chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc
|
| diff --git a/chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc b/chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc
|
| index 54cb31c27fc0f7c20fb7d5096208624810d6f919..9f305a828a84c9377ceb2efee00c084a8072fd17 100644
|
| --- a/chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc
|
| +++ b/chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.cc
|
| @@ -83,11 +83,11 @@ void ChromeDataUseAscriberService::RenderFrameCreated(
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::RenderFrameCreated,
|
| - base::Unretained(ascriber_),
|
| - render_frame_host->GetProcess()->GetID(),
|
| - render_frame_host->GetRoutingID(), main_render_process_id,
|
| - main_render_frame_id));
|
| + base::BindOnce(&ChromeDataUseAscriber::RenderFrameCreated,
|
| + base::Unretained(ascriber_),
|
| + render_frame_host->GetProcess()->GetID(),
|
| + render_frame_host->GetRoutingID(), main_render_process_id,
|
| + main_render_frame_id));
|
| }
|
|
|
| void ChromeDataUseAscriberService::RenderFrameDeleted(
|
| @@ -115,11 +115,11 @@ void ChromeDataUseAscriberService::RenderFrameDeleted(
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::RenderFrameDeleted,
|
| - base::Unretained(ascriber_),
|
| - render_frame_host->GetProcess()->GetID(),
|
| - render_frame_host->GetRoutingID(), main_render_process_id,
|
| - main_render_frame_id));
|
| + base::BindOnce(&ChromeDataUseAscriber::RenderFrameDeleted,
|
| + base::Unretained(ascriber_),
|
| + render_frame_host->GetProcess()->GetID(),
|
| + render_frame_host->GetRoutingID(), main_render_process_id,
|
| + main_render_frame_id));
|
| }
|
|
|
| void ChromeDataUseAscriberService::DidStartNavigation(
|
| @@ -133,11 +133,11 @@ void ChromeDataUseAscriberService::DidStartNavigation(
|
| content::WebContents* web_contents = navigation_handle->GetWebContents();
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::DidStartMainFrameNavigation,
|
| - base::Unretained(ascriber_), navigation_handle->GetURL(),
|
| - web_contents->GetRenderProcessHost()->GetID(),
|
| - web_contents->GetMainFrame()->GetRoutingID(),
|
| - navigation_handle));
|
| + base::BindOnce(&ChromeDataUseAscriber::DidStartMainFrameNavigation,
|
| + base::Unretained(ascriber_), navigation_handle->GetURL(),
|
| + web_contents->GetRenderProcessHost()->GetID(),
|
| + web_contents->GetMainFrame()->GetRoutingID(),
|
| + navigation_handle));
|
| }
|
|
|
| void ChromeDataUseAscriberService::ReadyToCommitNavigation(
|
| @@ -153,14 +153,14 @@ void ChromeDataUseAscriberService::ReadyToCommitNavigation(
|
| content::WebContents* web_contents = navigation_handle->GetWebContents();
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation,
|
| - base::Unretained(ascriber_), navigation_handle->GetURL(),
|
| - navigation_handle->GetGlobalRequestID(),
|
| - web_contents->GetRenderProcessHost()->GetID(),
|
| - web_contents->GetMainFrame()->GetRoutingID(),
|
| - !navigation_handle->HasCommitted() ||
|
| - navigation_handle->IsSameDocument(),
|
| - navigation_handle));
|
| + base::BindOnce(&ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation,
|
| + base::Unretained(ascriber_), navigation_handle->GetURL(),
|
| + navigation_handle->GetGlobalRequestID(),
|
| + web_contents->GetRenderProcessHost()->GetID(),
|
| + web_contents->GetMainFrame()->GetRoutingID(),
|
| + !navigation_handle->HasCommitted() ||
|
| + navigation_handle->IsSameDocument(),
|
| + navigation_handle));
|
| }
|
|
|
| void ChromeDataUseAscriberService::DidFinishNavigation(
|
| @@ -177,11 +177,11 @@ void ChromeDataUseAscriberService::DidFinishNavigation(
|
| content::WebContents* web_contents = navigation_handle->GetWebContents();
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::DidFinishNavigation,
|
| - base::Unretained(ascriber_),
|
| - web_contents->GetRenderProcessHost()->GetID(),
|
| - web_contents->GetMainFrame()->GetRoutingID(),
|
| - navigation_handle->GetPageTransition()));
|
| + base::BindOnce(&ChromeDataUseAscriber::DidFinishNavigation,
|
| + base::Unretained(ascriber_),
|
| + web_contents->GetRenderProcessHost()->GetID(),
|
| + web_contents->GetMainFrame()->GetRoutingID(),
|
| + navigation_handle->GetPageTransition()));
|
| }
|
|
|
| void ChromeDataUseAscriberService::SetDataUseAscriber(
|
| @@ -218,10 +218,10 @@ void ChromeDataUseAscriberService::WasShownOrHidden(
|
|
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::WasShownOrHidden,
|
| - base::Unretained(ascriber_),
|
| - main_render_frame_host->GetProcess()->GetID(),
|
| - main_render_frame_host->GetRoutingID(), visible));
|
| + base::BindOnce(&ChromeDataUseAscriber::WasShownOrHidden,
|
| + base::Unretained(ascriber_),
|
| + main_render_frame_host->GetProcess()->GetID(),
|
| + main_render_frame_host->GetRoutingID(), visible));
|
| }
|
|
|
| void ChromeDataUseAscriberService::RenderFrameHostChanged(
|
| @@ -233,10 +233,11 @@ void ChromeDataUseAscriberService::RenderFrameHostChanged(
|
| if (old_host) {
|
| content::BrowserThread::PostTask(
|
| content::BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&ChromeDataUseAscriber::RenderFrameHostChanged,
|
| - base::Unretained(ascriber_), old_host->GetProcess()->GetID(),
|
| - old_host->GetRoutingID(), new_host->GetProcess()->GetID(),
|
| - new_host->GetRoutingID()));
|
| + base::BindOnce(
|
| + &ChromeDataUseAscriber::RenderFrameHostChanged,
|
| + base::Unretained(ascriber_), old_host->GetProcess()->GetID(),
|
| + old_host->GetRoutingID(), new_host->GetProcess()->GetID(),
|
| + new_host->GetRoutingID()));
|
| }
|
| }
|
|
|
|
|