Revert "Revert 3 mac autofill CLs."

components/autofill/core/browser/autofill_external_delegate.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_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 62 matching lines @@
       const std::vector<base::string16>& data_list_labels);
 
   // Inform the delegate that the text field editing has ended. This is
   // used to help record the metrics of when a new popup is shown.
   void DidEndTextFieldEditing();
 
   // Returns the delegate to its starting state by removing any page specific
   // values or settings.
   void Reset();
 
+  // The renderer sent an IPC acknowledging an earlier ping IPC.
+  void OnPingAck();
+
  protected:
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr();
 
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
@@ skipping 11 matching lines @@
                             std::vector<base::string16>* icons,
                             std::vector<int>* unique_ids);
 
   // Insert the data list values at the start of the given list, including
   // any required separators.
   void InsertDataListValues(std::vector<base::string16>* values,
                             std::vector<base::string16>* labels,
                             std::vector<base::string16>* icons,
                             std::vector<int>* unique_ids);
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // Pings the renderer.
+  void PingRenderer();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
   AutofillManager* manager_;  // weak.
 
   // Provides driver-level context to the shared code of the component. Must
   // outlive this object.
   AutofillDriver* driver_;  // weak
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int query_id_;
 
@@ skipping 19 matching lines @@
   std::vector<base::string16> data_list_labels_;
 
   base::WeakPtrFactory<AutofillExternalDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_