DevTools: Remove geolocation override from renderer

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 13 matching lines @@
  */
 
 #include "config.h"
 
 #include "modules/geolocation/GeolocationController.h"
 
 #include "core/inspector/InspectorController.h"
 #include "core/page/Page.h"
 #include "modules/geolocation/GeolocationClient.h"
 #include "modules/geolocation/GeolocationError.h"
-#include "modules/geolocation/GeolocationInspectorAgent.h"
 #include "modules/geolocation/GeolocationPosition.h"
 
 namespace blink {
 
 GeolocationController::GeolocationController(LocalFrame& frame, GeolocationClient* client)
     : PageLifecycleObserver(frame.page())
     , m_client(client)
     , m_hasClientForTest(false)
     , m_isClientUpdating(false)
-    , m_inspectorAgent(nullptr)
 {
-    // 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()) {
-        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;
-    }
-
-    // m_inspectorAgent is 0 for out of process iframe instantiations, since inspector is currently unable
-    // to handle that scenario.
-    if (m_inspectorAgent)
-        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()
 {
     if (m_isClientUpdating)
         return;
     m_isClientUpdating = true;
     m_client->startUpdating();
 }
 
 void GeolocationController::stopUpdatingIfNeeded()
 {
     if (!m_isClientUpdating)
         return;
     m_isClientUpdating = false;
     m_client->stopUpdating();
 }
 
 GeolocationController::~GeolocationController()
 {
     ASSERT(m_observers.isEmpty());
 #if !ENABLE(OILPAN)
-    if (page() && m_inspectorAgent) {
-        m_inspectorAgent->removeController(this);
-        m_inspectorAgent = nullptr;
-    }
-
     if (m_hasClientForTest) {
         m_client->controllerForTestRemoved(this);
         m_hasClientForTest = false;
     }
 #endif
 }
 
 PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
 {
     return adoptPtrWillBeNoop(new GeolocationController(frame, client));
@@ skipping 39 matching lines @@
 }
 
 void GeolocationController::cancelPermissionRequest(Geolocation* geolocation)
 {
     if (m_client)
         m_client->cancelPermissionRequest(geolocation);
 }
 
 void GeolocationController::positionChanged(GeolocationPosition* position)
 {
-    position = m_inspectorAgent->overrideGeolocationPosition(position);
     if (!position) {
         errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, "PositionUnavailable"));
         return;
     }
     m_lastPosition = position;
     HeapVector<Member<Geolocation> > observersVector;
     copyToVector(m_observers, observersVector);
     for (size_t i = 0; i < observersVector.size(); ++i)
         observersVector[i]->positionChanged();
 }
@@ skipping 42 matching lines @@
 {
     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