Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

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 29 matching lines @@
     : PageLifecycleObserver(frame.page())
     , m_client(client)
     , m_hasClientForTest(false)
     , m_isClientUpdating(false)
     , m_inspectorAgent()
 {
     // FIXME: Once GeolocationInspectorAgent is per frame, there will be a 1:1 relationship between
     // it and this class. Until then, there's one GeolocationInspectorAgent per page that the main
     // frame is responsible for creating.
     if (frame.isMainFrame()) {
-        OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorAgent::create());
+        OwnPtrWillBeRawPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorAgent::create());
         m_inspectorAgent = geolocationAgent.get();
         frame.page()->inspectorController().registerModuleAgent(geolocationAgent.release());
     } else if (frame.page()->mainFrame()->isLocalFrame()) {
         m_inspectorAgent = GeolocationController::from(frame.page()->deprecatedLocalMainFrame())->m_inspectorAgent;
     }
 
-    if (m_inspectorAgent)
-        m_inspectorAgent->AddController(this);
+    m_inspectorAgent->addController(this);
 
     if (!frame.isMainFrame() && frame.page()->mainFrame()->isLocalFrame()) {
         // internals.setGeolocationClientMock is per page.
         GeolocationController* mainController = GeolocationController::from(frame.page()->deprecatedLocalMainFrame());
         if (mainController->hasClientForTest())
             setClientForTest(mainController->client());
     }
 }
 
 void GeolocationController::startUpdatingIfNeeded()
@@ skipping 13 matching lines @@
 }
 
 GeolocationController::~GeolocationController()
 {
     ASSERT(m_observers.isEmpty());
     detach();
 }
 
 void GeolocationController::detach()
 {
+#if !ENABLE(OILPAN)
     if (page() && m_inspectorAgent) {
-        m_inspectorAgent->RemoveController(this);
-        m_inspectorAgent = 0;
+        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()
@@ skipping 117 matching lines @@
 const char* GeolocationController::supplementName()
 {
     return "GeolocationController";
 }
 
 void GeolocationController::trace(Visitor* visitor)
 {
     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