Remove ContextClient from NavigatorDoNotTrack

third_party/WebKit/Source/modules/donottrack/NavigatorDoNotTrack.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "modules/donottrack/NavigatorDoNotTrack.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/loader/FrameLoaderClient.h"
 
 namespace blink {
 
-NavigatorDoNotTrack::NavigatorDoNotTrack(LocalFrame* frame)
-    : ContextClient(frame) {}
+NavigatorDoNotTrack::NavigatorDoNotTrack(Navigator& navigator)
+    : Supplement<Navigator>(navigator) {}
 
 DEFINE_TRACE(NavigatorDoNotTrack) {
   Supplement<Navigator>::trace(visitor);
-  ContextClient::trace(visitor);
 }
 
 const char* NavigatorDoNotTrack::supplementName() {
   return "NavigatorDoNotTrack";
 }
 
 NavigatorDoNotTrack& NavigatorDoNotTrack::from(Navigator& navigator) {
   NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(
       Supplement<Navigator>::from(navigator, supplementName()));
   if (!supplement) {
-    supplement = new NavigatorDoNotTrack(navigator.frame());
+    supplement = new NavigatorDoNotTrack(navigator);
     provideTo(navigator, supplementName(), supplement);
   }
   return *supplement;
 }
 
 String NavigatorDoNotTrack::doNotTrack(Navigator& navigator) {
   return NavigatorDoNotTrack::from(navigator).doNotTrack();
 }
 
 String NavigatorDoNotTrack::doNotTrack() {
-  if (!frame() || !frame()->loader().client())
+  LocalFrame* frame = host()->frame();
+  if (!frame || !frame->loader().client())
     return String();
-  return frame()->loader().client()->doNotTrackValue();
+  return frame->loader().client()->doNotTrackValue();
 }
 
 }  // namespace blink