Tidy up WebGeolocationController.

third_party/WebKit/Source/web/WebGeolocationController.cpp

 /*
  * Copyright (C) 2010 Google 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
@@ skipping 17 matching lines @@
 #include "modules/geolocation/GeolocationController.h"
 #include "modules/geolocation/GeolocationError.h"
 #include "modules/geolocation/GeolocationPosition.h"
 #include "platform/heap/Handle.h"
 #include "public/web/WebGeolocationError.h"
 #include "public/web/WebGeolocationPosition.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
-// TODO(Oilpan): once GeolocationController is always on the heap,
-// shorten out this GeolocationControllerPrivate intermediary.
-class GeolocationControllerPrivate final : public GarbageCollected<GeolocationControllerPrivate> {
-public:
-    static GeolocationControllerPrivate* create(GeolocationController* controller)
-    {
-        return new GeolocationControllerPrivate(controller);
-    }
-
-    static GeolocationController& controller(const WebPrivatePtr<GeolocationControllerPrivate>& controller)
-    {
-        DCHECK(!controller.isNull());
-        DCHECK(controller->m_controller);
-        return *controller->m_controller;
-    }
-
-    DEFINE_INLINE_TRACE()
-    {
-        visitor->trace(m_controller);
-    }
-
-private:
-    explicit GeolocationControllerPrivate(GeolocationController* controller)
-        : m_controller(controller)
-    {
-    }
-
-    // Non-Oilpan, this bare pointer is owned as a supplement and kept alive
-    // by the frame of the WebLocalFrame which creates the WebGeolocationController
-    // object that wraps it all up.
-    Member<GeolocationController> m_controller;
-};
-
 WebGeolocationController::WebGeolocationController(GeolocationController* controller)
-    : m_private(GeolocationControllerPrivate::create(controller))
+    : m_private(controller)
 {
 }
 
 void WebGeolocationController::reset()
 {
     m_private.reset();
 }
 
 void WebGeolocationController::positionChanged(const WebGeolocationPosition& webPosition)
 {
-    GeolocationControllerPrivate::controller(m_private).positionChanged(static_cast<GeolocationPosition*>(webPosition));
+    m_private->positionChanged(static_cast<GeolocationPosition*>(webPosition));
 }
 
 void WebGeolocationController::errorOccurred(const WebGeolocationError& webError)
 {
-    GeolocationControllerPrivate::controller(m_private).errorOccurred(static_cast<GeolocationError*>(webError));
+    m_private->errorOccurred(static_cast<GeolocationError*>(webError));
 }
 
 } // namespace blink