Convert DelegationTracker::DelegatedForChild to use the new navigation callbacks.

chrome/browser/permissions/delegation_tracker.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/permissions/delegation_tracker.h"
 
 #include <unordered_set>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/permissions/permission_util.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class DelegationTracker::DelegatedForChild : content::WebContentsObserver {
  public:
   DelegatedForChild(content::RenderFrameHost* child_rfh,
                     const std::vector<content::PermissionType>& permissions,
                     const base::Callback<void(content::RenderFrameHost*)>&
@@ skipping 21 matching lines @@
   // WebContentsObserver
   void RenderFrameHostChanged(content::RenderFrameHost* old_host,
                               content::RenderFrameHost* new_host) override {
     ClearPermissions(old_host);
   }
 
   void FrameDeleted(content::RenderFrameHost* render_frame_host) override {
     ClearPermissions(render_frame_host);
   }
 
-  void DidNavigateAnyFrame(
-      content::RenderFrameHost* render_frame_host,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override {
-    ClearPermissions(render_frame_host);
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (navigation_handle->HasCommitted())
+      ClearPermissions(navigation_handle->GetRenderFrameHost());
   }
 
   content::RenderFrameHost* child_rfh_;
 
   std::unordered_set<content::PermissionType, PermissionTypeHash> permissions_;
 
   base::Callback<void(content::RenderFrameHost*)> rfh_destroyed_callback_;
 };
 
 DelegationTracker::DelegationTracker() {}
@@ skipping 28 matching lines @@
         return false;
     }
     child_rfh = child_rfh->GetParent();
   }
   return true;
 }
 
 void DelegationTracker::RenderFrameHostChanged(content::RenderFrameHost* rfh) {
   delegated_permissions_.erase(rfh);
 }