Fix password manager internals renderer reporting

components/password_manager/content/browser/content_password_manager_driver.cc

 // Copyright 2014 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/content_password_manager_driver.h"
 
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/content/browser/bad_message.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
+#include "components/password_manager/core/browser/log_manager.h"
+#include "components/password_manager/core/browser/password_manager.h"

[vasilii, 2015/11/13 12:17:31]

Why do you need this guy here?

[vabr (Chromium), 2015/11/13 20:48:18]

Line 184 (existing code) calls a method of the PasswordManager. I guess it
compiled because of some indirect #includes.

 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/cert/cert_status_flags.h"
 
 namespace password_manager {
 
 ContentPasswordManagerDriver::ContentPasswordManagerDriver(
     content::RenderFrameHost* render_frame_host,
     PasswordManagerClient* client,
     autofill::AutofillClient* autofill_client)
     : render_frame_host_(render_frame_host),
       client_(client),
       password_generation_manager_(client, this),
       password_autofill_manager_(this, autofill_client),
-      next_free_key_(0) {
-}
+      next_free_key_(0) {}
 
 ContentPasswordManagerDriver::~ContentPasswordManagerDriver() {
 }
 
 // static
 ContentPasswordManagerDriver*
 ContentPasswordManagerDriver::GetForRenderFrameHost(
     content::RenderFrameHost* render_frame_host) {
   ContentPasswordManagerDriverFactory* factory =
       ContentPasswordManagerDriverFactory::FromWebContents(
@@ skipping 59 matching lines @@
 void ContentPasswordManagerDriver::ClearPreviewedForm() {
   content::RenderFrameHost* host = render_frame_host_;
   host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
 }
 
 void ContentPasswordManagerDriver::ForceSavePassword() {
   content::RenderFrameHost* host = render_frame_host_;
   host->Send(new AutofillMsg_FindFocusedPasswordForm(host->GetRoutingID()));
 }
 
+void ContentPasswordManagerDriver::NotifyAboutLoggingAvailability(
+    bool is_available) {
+  if (is_available == logging_available_)
+    return;
+  logging_available_ = is_available;
+  SendLoggingAvailability();
+}
+
+void ContentPasswordManagerDriver::SendLoggingAvailability() {

[vasilii, 2015/11/13 12:17:31]

Declaration order should match the definition order.

[vabr (Chromium), 2015/11/13 20:48:18]

Done.

+  render_frame_host_->Send(new AutofillMsg_SetLoggingState(
+      render_frame_host_->GetRoutingID(), logging_available_));
+}
+
 PasswordGenerationManager*
 ContentPasswordManagerDriver::GetPasswordGenerationManager() {
   return &password_generation_manager_;
 }
 
 PasswordManager* ContentPasswordManagerDriver::GetPasswordManager() {
   return client_->GetPasswordManager();
 }
 
 PasswordAutofillManager*
@@ skipping 11 matching lines @@
   IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordFormSubmitted,
                       OnPasswordFormSubmitted)
   IPC_MESSAGE_HANDLER(AutofillHostMsg_InPageNavigation, OnInPageNavigation)
   IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordNoLongerGenerated,
                       OnPasswordNoLongerGenerated)
   IPC_MESSAGE_HANDLER(AutofillHostMsg_FocusedPasswordFormFound,
                       OnFocusedPasswordFormFound)
   IPC_MESSAGE_FORWARD(AutofillHostMsg_ShowPasswordSuggestions,
                       &password_autofill_manager_,
                       PasswordAutofillManager::OnShowPasswordSuggestions)
-  IPC_MESSAGE_FORWARD(AutofillHostMsg_RecordSavePasswordProgress, client_,
-                      PasswordManagerClient::LogSavePasswordProgress)
+  IPC_MESSAGE_FORWARD(AutofillHostMsg_RecordSavePasswordProgress,
+                      client_->GetLogManager(),
+                      LogManager::LogSavePasswordProgress)
+  IPC_MESSAGE_HANDLER(AutofillHostMsg_PasswordAutofillAgentConstructed,
+                      SendLoggingAvailability)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ContentPasswordManagerDriver::OnPasswordFormsParsed(
     const std::vector<autofill::PasswordForm>& forms) {
   for (const auto& form : forms)
     if (!CheckChildProcessSecurityPolicy(
             form.origin, BadMessageReason::CPMD_BAD_ORIGIN_FORMS_PARSED))
@@ skipping 73 matching lines @@
   if (!policy->CanAccessDataForOrigin(render_frame_host_->GetProcess()->GetID(),
                                       url)) {
     bad_message::ReceivedBadMessage(render_frame_host_->GetProcess(), reason);
     return false;
   }
 
   return true;
 }
 
 }  // namespace password_manager