Re-land r248110 with ASAN error fixed.

components/autofill/content/renderer/autofill_agent.h

Index: components/autofill/content/renderer/autofill_agent.h
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index 7bc7f60d6110810df35f687d99a6771da04a487c..cb4df0317f580c4c423bf3eae2749a7278ddb4e1 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -32,6 +32,7 @@ struct FormData;
 struct FormFieldData;
 struct WebElementDescriptor;
 class PasswordAutofillAgent;
+class PasswordGenerationAgent;
 
 // AutofillAgent deals with Autofill related communications between WebKit and
 // the browser.  There is one AutofillAgent per RenderView.
@@ -46,8 +47,11 @@ class AutofillAgent : public content::RenderViewObserver,
                       public blink::WebAutofillClient {
  public:
   // PasswordAutofillAgent is guaranteed to outlive AutofillAgent.
+  // PasswordGenerationAgent may be NULL. If it is not, then it is also
+  // guaranteed to outlive AutofillAgent.
   AutofillAgent(content::RenderView* render_view,
-                PasswordAutofillAgent* password_autofill_manager);
+                PasswordAutofillAgent* password_autofill_manager,
+                PasswordGenerationAgent* password_generation_agent);
   virtual ~AutofillAgent();
 
  private:
@@ -174,7 +178,8 @@ class AutofillAgent : public content::RenderViewObserver,
 
   FormCache form_cache_;
 
-  PasswordAutofillAgent* password_autofill_agent_;  // WEAK reference.
+  PasswordAutofillAgent* password_autofill_agent_;  // Weak reference.
+  PasswordGenerationAgent* password_generation_agent_;  // Weak reference.
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.