Re-land r248110 with ASAN error fixed.

components/autofill/content/renderer/autofill_agent.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 #define COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 class WebNode;
 class WebView;
 }
 
 namespace autofill {
 
 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.
 // This code was originally part of RenderView.
 // Note that Autofill encompasses:
 // - single text field suggestions, that we usually refer to as Autocomplete,
 // - password form fill, refered to as Password Autofill, and
 // - entire form fill based on one field entry, referred to as Form Autofill.
 
 class AutofillAgent : public content::RenderViewObserver,
                       public PageClickListener,
                       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:
   enum AutofillAction {
     AUTOFILL_NONE,     // No state set.
     AUTOFILL_FILL,     // Fill the Autofill form data.
     AUTOFILL_PREVIEW,  // Preview the Autofill form data.
   };
 
   // RenderView::Observer:
@@ skipping 106 matching lines @@
       FormFieldData* field) WARN_UNUSED_RESULT;
 
   // Set |node| to display the given |value|.
   void SetNodeText(const base::string16& value, blink::WebInputElement* node);
 
   // Hides any currently showing Autofill UI.
   void HideAutofillUI();
 
   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.
   int autofill_query_id_;
 
   // The element corresponding to the last request sent for form field Autofill.
   blink::WebInputElement element_;
 
   // The form element currently requesting an interactive autocomplete.
   blink::WebFormElement in_flight_request_form_;
@@ skipping 45 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(
       PasswordAutofillAgentTest,
       PasswordAutofillTriggersOnChangeEventsWaitForUsername);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillAgent);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_RENDERER_AUTOFILL_AGENT_H_