Revert of [Autofill] Migrate ContentPasswordManagerDriver<-->Password{Autofill,Generation}Agent IPCs to mojo.

components/autofill/content/renderer/autofill_agent.cc

Index: components/autofill/content/renderer/autofill_agent.cc
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 55385e64edce3ab7376929f950c91246bcc6178e..9f32ae842d3f42b64f2b27b2873f6b798c9a2fec 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -21,6 +21,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/page_click_tracker.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
@@ -558,8 +559,7 @@
   std::vector<blink::WebInputElement> elements;
   std::unique_ptr<RendererSavePasswordProgressLogger> logger;
   if (password_autofill_agent_->logging_state_active()) {
-    logger.reset(new RendererSavePasswordProgressLogger(
-        GetPasswordManagerDriver().get()));
+    logger.reset(new RendererSavePasswordProgressLogger(this, routing_id()));
     logger->LogMessage(SavePasswordProgressLogger::
                            STRING_ON_SHOW_INITIAL_PASSWORD_ACCOUNT_SUGGESTIONS);
   }
@@ -782,18 +782,12 @@
 }
 
 const mojom::AutofillDriverPtr& AutofillAgent::GetAutofillDriver() {
-  if (!autofill_driver_) {
+  if (!mojo_autofill_driver_) {
     render_frame()->GetRemoteInterfaces()->GetInterface(
-        mojo::GetProxy(&autofill_driver_));
-  }
-
-  return autofill_driver_;
-}
-
-const mojom::PasswordManagerDriverPtr&
-AutofillAgent::GetPasswordManagerDriver() {
-  DCHECK(password_autofill_agent_);
-  return password_autofill_agent_->GetPasswordManagerDriver();
+        mojo::GetProxy(&mojo_autofill_driver_));
+  }
+
+  return mojo_autofill_driver_;
 }
 
 // LegacyAutofillAgent ---------------------------------------------------------