| Index: third_party/WebKit/Source/modules/nfc/NFC.cpp
|
| diff --git a/third_party/WebKit/Source/modules/nfc/NFC.cpp b/third_party/WebKit/Source/modules/nfc/NFC.cpp
|
| index 8947830f746e5fb7f7685ce7d2e7a87bfe8aecd6..4a5388f8bea84da585a9e077afcaac5a72150d9b 100644
|
| --- a/third_party/WebKit/Source/modules/nfc/NFC.cpp
|
| +++ b/third_party/WebKit/Source/modules/nfc/NFC.cpp
|
| @@ -444,7 +444,7 @@ NFC::NFC(LocalFrame* frame)
|
| {
|
| ThreadState::current()->registerPreFinalizer(this);
|
| frame->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_nfc));
|
| - m_nfc.set_connection_error_handler(createBaseCallback(bind(&NFC::OnConnectionError, wrapWeakPersistent(this))));
|
| + m_nfc.set_connection_error_handler(createBaseCallback(WTF::bind(&NFC::OnConnectionError, wrapWeakPersistent(this))));
|
| m_nfc->SetClient(m_client.CreateInterfacePtrAndBind());
|
| }
|
|
|
| @@ -495,7 +495,7 @@ ScriptPromise NFC::push(ScriptState* scriptState, const NFCPushMessage& pushMess
|
|
|
| ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
|
| m_requests.add(resolver);
|
| - auto callback = createBaseCallback(bind(&NFC::OnRequestCompleted, wrapPersistent(this), wrapPersistent(resolver)));
|
| + auto callback = createBaseCallback(WTF::bind(&NFC::OnRequestCompleted, wrapPersistent(this), wrapPersistent(resolver)));
|
| m_nfc->Push(std::move(message), nfc::NFCPushOptions::From(options), callback);
|
|
|
| return resolver->promise();
|
| @@ -512,7 +512,7 @@ ScriptPromise NFC::cancelPush(ScriptState* scriptState, const String& target)
|
|
|
| ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
|
| m_requests.add(resolver);
|
| - auto callback = createBaseCallback(bind(&NFC::OnRequestCompleted, wrapPersistent(this), wrapPersistent(resolver)));
|
| + auto callback = createBaseCallback(WTF::bind(&NFC::OnRequestCompleted, wrapPersistent(this), wrapPersistent(resolver)));
|
| m_nfc->CancelPush(mojo::toNFCPushTarget(target), callback);
|
|
|
| return resolver->promise();
|
|
|