diff options
7 files changed, 8 insertions, 10 deletions
diff --git a/components/autofill/browser/autocheckout_manager.cc b/components/autofill/browser/autocheckout_manager.cc index 6969ea4..1d58ae5 100644 --- a/components/autofill/browser/autocheckout_manager.cc +++ b/components/autofill/browser/autocheckout_manager.cc @@ -99,7 +99,7 @@ AutocheckoutManager::AutocheckoutManager(AutofillManager* autofill_manager) is_autocheckout_bubble_showing_(false), in_autocheckout_flow_(false), google_transaction_id_(kTransactionIdNotSet), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} AutocheckoutManager::~AutocheckoutManager() { } diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc index 6ab20c7..20c16e8 100644 --- a/components/autofill/browser/autofill_manager.cc +++ b/components/autofill/browser/autofill_manager.cc @@ -216,7 +216,7 @@ AutofillManager::AutofillManager(content::WebContents* web_contents, user_did_edit_autofilled_field_(false), external_delegate_(NULL), test_delegate_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } AutofillManager::~AutofillManager() {} @@ -955,7 +955,7 @@ AutofillManager::AutofillManager(content::WebContents* web_contents, user_did_edit_autofilled_field_(false), external_delegate_(NULL), test_delegate_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(web_contents); DCHECK(manager_delegate_); } diff --git a/components/autofill/browser/wallet/wallet_client.cc b/components/autofill/browser/wallet/wallet_client.cc index f9ff1c7..4dbf552 100644 --- a/components/autofill/browser/wallet/wallet_client.cc +++ b/components/autofill/browser/wallet/wallet_client.cc @@ -236,8 +236,7 @@ WalletClient::WalletClient(net::URLRequestContextGetter* context_getter, delegate_(delegate), request_type_(NO_PENDING_REQUEST), one_time_pad_(kOneTimePadLength), - ALLOW_THIS_IN_INITIALIZER_LIST( - encryption_escrow_client_(context_getter, this)) { + encryption_escrow_client_(context_getter, this) { DCHECK(context_getter_); DCHECK(delegate_); } diff --git a/components/autofill/renderer/autofill_agent.cc b/components/autofill/renderer/autofill_agent.cc index 6e2a91e..beefed0 100644 --- a/components/autofill/renderer/autofill_agent.cc +++ b/components/autofill/renderer/autofill_agent.cc @@ -153,7 +153,7 @@ AutofillAgent::AutofillAgent(content::RenderView* render_view, autocheckout_click_in_progress_(false), try_to_show_autocheckout_bubble_(false), ignore_text_changes_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { render_view->GetWebView()->setAutofillClient(this); // The PageClickTracker is a RenderViewObserver, and hence will be freed when diff --git a/components/autofill/renderer/password_autofill_agent.cc b/components/autofill/renderer/password_autofill_agent.cc index 8372a73..704e54fa 100644 --- a/components/autofill/renderer/password_autofill_agent.cc +++ b/components/autofill/renderer/password_autofill_agent.cc @@ -207,7 +207,7 @@ PasswordAutofillAgent::PasswordAutofillAgent(content::RenderView* render_view) : content::RenderViewObserver(render_view), disable_popup_(false), web_view_(render_view->GetWebView()), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { } PasswordAutofillAgent::~PasswordAutofillAgent() { diff --git a/components/navigation_interception/intercept_navigation_resource_throttle.cc b/components/navigation_interception/intercept_navigation_resource_throttle.cc index 3d58ae3..984eebe 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle.cc @@ -60,7 +60,7 @@ InterceptNavigationResourceThrottle::InterceptNavigationResourceThrottle( CheckOnUIThreadCallback should_ignore_callback) : request_(request), should_ignore_callback_(should_ignore_callback), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { } InterceptNavigationResourceThrottle::~InterceptNavigationResourceThrottle() { diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc index 6db2026..f8a22ab 100644 --- a/components/visitedlink/browser/visitedlink_master.cc +++ b/components/visitedlink/browser/visitedlink_master.cc @@ -184,8 +184,7 @@ VisitedLinkMaster::VisitedLinkMaster(content::BrowserContext* browser_context, bool persist_to_disk) : browser_context_(browser_context), delegate_(delegate), - listener_(new VisitedLinkEventListener( - ALLOW_THIS_IN_INITIALIZER_LIST(this), browser_context)), + listener_(new VisitedLinkEventListener(this, browser_context)), persist_to_disk_(persist_to_disk) { InitMembers(); } |