Move GeolocationClient to the Oilpan heap.

Source/modules/geolocation/GeolocationController.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 68 matching lines @@
 {
     if (!m_isClientUpdating)
         return;
     m_isClientUpdating = false;
     m_client->stopUpdating();
 }
 
 GeolocationController::~GeolocationController()
 {
     ASSERT(m_observers.isEmpty());
-    detach();
-}
-
-void GeolocationController::detach()
-{
 #if !ENABLE(OILPAN)
     if (page() && m_inspectorAgent) {
         m_inspectorAgent->removeController(this);
         m_inspectorAgent = nullptr;
     }
-#endif
 
     if (m_hasClientForTest) {
         m_client->controllerForTestRemoved(this);
         m_hasClientForTest = false;
     }
-}
-
-// FIXME: Oilpan: Once GeolocationClient is on-heap m_client should be a strong
-// pointer and |willBeDestroyed| can potentially be removed from Supplement.
-void GeolocationController::willBeDestroyed()
-{
-    detach();
-    if (m_client) {
-        m_client->geolocationDestroyed();
-        m_client = 0;
-    }
+#endif
 }
 
 void GeolocationController::persistentHostHasBeenDestroyed()
 {
     observeContext(0);
 }
 
 PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
 {
     return adoptPtrWillBeNoop(new GeolocationController(frame, client));
@@ skipping 98 matching lines @@
         stopUpdatingIfNeeded();
 }
 
 const char* GeolocationController::supplementName()
 {
     return "GeolocationController";
 }
 
 void GeolocationController::trace(Visitor* visitor)
 {
+    visitor->trace(m_client);
     visitor->trace(m_lastPosition);
     visitor->trace(m_observers);
     visitor->trace(m_highAccuracyObservers);
     visitor->trace(m_inspectorAgent);
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client)
 {
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
 }
 
 } // namespace blink