Finish migration from sameThreadBindForMojo to createBaseCallback.

third_party/WebKit/Source/modules/geolocation/Geolocation.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 403 matching lines @@
     if (m_geolocationPermission != PermissionUnknown)
         return;
 
     LocalFrame* frame = this->frame();
     if (!frame)
         return;
 
     m_geolocationPermission = PermissionRequested;
     frame->serviceRegistry()->connectToRemoteService(
         mojo::GetProxy(&m_permissionService));
-    m_permissionService.set_connection_error_handler(sameThreadBindForMojo(&Geolocation::onPermissionConnectionError, this));
+    m_permissionService.set_connection_error_handler(createBaseCallback(bind(&Geolocation::onPermissionConnectionError, WeakPersistentThisPointer<Geolocation>(this))));
 
     // Ask the embedder: it maintains the geolocation challenge policy itself.
     m_permissionService->RequestPermission(
         mojom::blink::PermissionName::GEOLOCATION,
         getExecutionContext()->getSecurityOrigin()->toString(),
-        sameThreadBindForMojo(&Geolocation::onGeolocationPermissionUpdated, this));
+        createBaseCallback(bind<mojom::blink::PermissionStatus>(&Geolocation::onGeolocationPermissionUpdated, this)));
 }
 
 void Geolocation::makeSuccessCallbacks()
 {
     ASSERT(m_lastPosition);
     ASSERT(isAllowed());
 
     GeoNotifierVector oneShotsCopy;
     copyToVector(m_oneShots, oneShotsCopy);
 
@@ skipping 44 matching lines @@
 {
     if (!getExecutionContext() || !page() || !page()->isPageVisible() || !m_updating) {
         m_geolocationService.reset();
         m_disconnectedGeolocationService = true;
         return;
     }
     if (m_geolocationService)
         return;
 
     frame()->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_geolocationService));
-    m_geolocationService.set_connection_error_handler(sameThreadBindForMojo(&Geolocation::onGeolocationConnectionError, this));
+    m_geolocationService.set_connection_error_handler(createBaseCallback(bind(&Geolocation::onGeolocationConnectionError, WeakPersistentThisPointer<Geolocation>(this))));
     if (m_enableHighAccuracy)
         m_geolocationService->SetHighAccuracy(true);
     queryNextPosition();
 }
 
 void Geolocation::queryNextPosition()
 {
-    m_geolocationService->QueryNextPosition(
-        sameThreadBindForMojo(&Geolocation::onPositionUpdated, this));
+    m_geolocationService->QueryNextPosition(createBaseCallback(bind<mojom::blink::GeopositionPtr>(&Geolocation::onPositionUpdated, this)));
 }
 
 void Geolocation::onPositionUpdated(mojom::blink::GeopositionPtr position)
 {
     m_disconnectedGeolocationService = false;
     if (position->valid) {
         m_lastPosition = createGeoposition(*position);
         positionChanged();
     } else {
         handleError(createPositionError(position->error_code, position->error_message));
@@ skipping 13 matching lines @@
     error->setIsFatal(true);
     handleError(error);
 }
 
 void Geolocation::onPermissionConnectionError()
 {
     onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED);
 }
 
 } // namespace blink