Remove ContextClient from NavigatorGeolocation

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

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
  *  Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
  *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 12 matching lines @@
 
 #include "modules/geolocation/NavigatorGeolocation.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "modules/geolocation/Geolocation.h"
 
 namespace blink {
 
-NavigatorGeolocation::NavigatorGeolocation(LocalFrame* frame)
-    : ContextClient(frame) {}
+NavigatorGeolocation::NavigatorGeolocation(Navigator& navigator)
+    : Supplement<Navigator>(navigator) {}
 
 const char* NavigatorGeolocation::supplementName() {
   return "NavigatorGeolocation";
 }
 
 NavigatorGeolocation& NavigatorGeolocation::from(Navigator& navigator) {
   NavigatorGeolocation* supplement = static_cast<NavigatorGeolocation*>(
       Supplement<Navigator>::from(navigator, supplementName()));
   if (!supplement) {
-    supplement = new NavigatorGeolocation(navigator.frame());
+    supplement = new NavigatorGeolocation(navigator);
     provideTo(navigator, supplementName(), supplement);
   }
   return *supplement;
 }
 
 Geolocation* NavigatorGeolocation::geolocation(Navigator& navigator) {
   return NavigatorGeolocation::from(navigator).geolocation();
 }
 
 Geolocation* NavigatorGeolocation::geolocation() {
-  if (!m_geolocation && frame())
-    m_geolocation = Geolocation::create(frame()->document());
+  if (!m_geolocation && host()->frame())
+    m_geolocation = Geolocation::create(host()->frame()->document());
   return m_geolocation;
 }
 
 DEFINE_TRACE(NavigatorGeolocation) {
   visitor->trace(m_geolocation);
   Supplement<Navigator>::trace(visitor);
-  ContextClient::trace(visitor);
 }
 
 }  // namespace blink