Track visible password fields by RenderFrameHost, not frame tree node

components/password_manager/content/browser/visible_password_observer.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 "components/password_manager/content/browser/visible_password_observer.h"
 
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/origin_util.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(password_manager::VisiblePasswordObserver);
 
 namespace password_manager {
 
 VisiblePasswordObserver::~VisiblePasswordObserver() {}
 
 void VisiblePasswordObserver::RenderFrameHasVisiblePasswordField(
     content::RenderFrameHost* render_frame_host) {
-  frame_tree_nodes_with_visible_password_fields_.insert(
-      render_frame_host->GetFrameTreeNodeId());
+  frames_with_visible_password_fields_.insert(render_frame_host);
   MaybeNotifyPasswordInputShownOnHttp();
 }
 
 void VisiblePasswordObserver::RenderFrameHasNoVisiblePasswordFields(
     content::RenderFrameHost* render_frame_host) {
-  frame_tree_nodes_with_visible_password_fields_.erase(
-      render_frame_host->GetFrameTreeNodeId());
+  frames_with_visible_password_fields_.erase(render_frame_host);
   MaybeNotifyAllFieldsInvisible();
 }
 
 void VisiblePasswordObserver::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   // If a renderer process crashes, it won't send notifications that
   // the password fields have been hidden, so watch for crashing
   // processes and remove them from
-  // |frame_tree_nodes_with_visible_password_fields_|.
-  frame_tree_nodes_with_visible_password_fields_.erase(
-      render_frame_host->GetFrameTreeNodeId());
+  // |frames_with_visible_password_fields_|.
+  frames_with_visible_password_fields_.erase(render_frame_host);
   MaybeNotifyAllFieldsInvisible();
 }
 
 VisiblePasswordObserver::VisiblePasswordObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents), web_contents_(web_contents) {}
 
 void VisiblePasswordObserver::MaybeNotifyPasswordInputShownOnHttp() {
   if (!content::IsOriginSecure(web_contents_->GetVisibleURL())) {
     web_contents_->OnPasswordInputShownOnHttp();
   }
 }
 
 void VisiblePasswordObserver::MaybeNotifyAllFieldsInvisible() {
-  if (frame_tree_nodes_with_visible_password_fields_.empty() &&
+  if (frames_with_visible_password_fields_.empty() &&
       !content::IsOriginSecure(web_contents_->GetVisibleURL())) {
     web_contents_->OnAllPasswordInputsHiddenOnHttp();
   }
 }
 
 }  // namespace password_manager