Reduce visibility of methods in AutofillManager and AutofillDownload.

chrome/browser/autofill/autofill_manager.h

 // Copyright (c) 2011 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 CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 36 matching lines @@
 // forms.
 class AutofillManager : public TabContentsObserver,
                         public AutofillDownloadManager::Observer {
  public:
   explicit AutofillManager(TabContentsWrapper* tab_contents);
   virtual ~AutofillManager();
 
   // Registers our Enable/Disable Autofill pref.
   static void RegisterUserPrefs(PrefService* prefs);
 
-  // TabContentsObserver implementation.
-  virtual void DidNavigateMainFramePostCommit(
-      const content::LoadCommittedDetails& details,
-      const ViewHostMsg_FrameNavigate_Params& params);
-  virtual bool OnMessageReceived(const IPC::Message& message);
+ protected:
+  // Only test code should subclass AutofillManager.
 
-  // AutofillDownloadManager::Observer implementation:
-  virtual void OnLoadedServerPredictions(const std::string& response_xml);
-  virtual void OnUploadedPossibleFieldTypes();
-  virtual void OnServerRequestError(
-      const std::string& form_signature,
-      AutofillDownloadManager::AutofillRequestType request_type,
-      int http_error);
+  // The string/int pair is composed of the guid string and variant index
+  // respectively.  The variant index is an index into the multi-valued item
+  // (where applicable).
+  typedef std::pair<std::string, size_t> GUIDPair;
+
+  // Test code should prefer to use this constructor.
+  AutofillManager(TabContentsWrapper* tab_contents,
+                  PersonalDataManager* personal_data);
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
-  // Imports the form data, submitted by the user, into |personal_data_|.
-  void ImportFormData(const FormStructure& submitted_form);
-
   // Uploads the form data to the Autofill server.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
   // Reset cache.
   void Reset();
 
- protected:
-  // For tests:
-
-  // The string/int pair is composed of the guid string and variant index
-  // respectively.  The variant index is an index into the multi-valued item
-  // (where applicable).
-  typedef std::pair<std::string, size_t> GUIDPair;
-
-  AutofillManager(TabContentsWrapper* tab_contents,
-                  PersonalDataManager* personal_data);
-
-  void set_personal_data_manager(PersonalDataManager* personal_data) {
-    personal_data_ = personal_data;
-  }
-
-  const AutofillMetrics* metric_logger() const { return metric_logger_.get(); }
-  void set_metric_logger(const AutofillMetrics* metric_logger);
-
-  ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
-
   // Maps GUIDs to and from IDs that are used to identify profiles and credit
   // cards sent to and from the renderer process.
   virtual int GUIDToID(const GUIDPair& guid) const;
   virtual const GUIDPair IDToGUID(int id) const;
 
   // Methods for packing and unpacking credit card and profile IDs for sending
   // and receiving to and from the renderer process.
   int PackGUIDs(const GUIDPair& cc_guid, const GUIDPair& profile_guid) const;
   void UnpackGUIDs(int id, GUIDPair* cc_guid, GUIDPair* profile_guid) const;
 
+  const AutofillMetrics* metric_logger() const { return metric_logger_.get(); }
+  void set_metric_logger(const AutofillMetrics* metric_logger);
+
+  ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
+
  private:
+  // TabContentsObserver:
+  virtual void DidNavigateMainFramePostCommit(
+      const content::LoadCommittedDetails& details,
+      const ViewHostMsg_FrameNavigate_Params& params);

[dhollowa, 2011/10/26 15:58:33]

OVERRIDE with these virtual methods.

[Ilya Sherman, 2011/10/26 23:06:32]

Done.

+  virtual bool OnMessageReceived(const IPC::Message& message);
+
+  // AutofillDownloadManager::Observer:
+  virtual void OnLoadedServerPredictions(const std::string& response_xml);
+
   void OnFormSubmitted(const webkit_glue::FormData& form,
                        const base::TimeTicks& timestamp);
   void OnFormsSeen(const std::vector<webkit_glue::FormData>& forms,
                    const base::TimeTicks& timestamp);
   void OnTextFieldDidChange(const webkit_glue::FormData& form,
                             const webkit_glue::FormField& field,
                             const base::TimeTicks& timestamp);
   void OnQueryFormFieldAutofill(int query_id,
                                 const webkit_glue::FormData& form,
                                 const webkit_glue::FormField& field);
@@ skipping 86 matching lines @@
                             size_t variant,
                             webkit_glue::FormField* field);
 
   // Parses the forms using heuristic matching and querying the Autofill server.
   void ParseForms(const std::vector<webkit_glue::FormData>& forms);
 
   // Uses existing personal data to determine possible field types for the
   // |submitted_form|.
   void DeterminePossibleFieldTypesForUpload(FormStructure* submitted_form);
 
+  // Imports the form data, submitted by the user, into |personal_data_|.
+  void ImportFormData(const FormStructure& submitted_form);
+
   // If |initial_interaction_timestamp_| is unset or is set to a later time than
   // |interaction_timestamp|, updates the cached timestamp.  The latter check is
   // needed because IPC messages can arrive out of order.
   void UpdateInitialInteractionTimestamp(
       const base::TimeTicks& interaction_timestamp);
 
   // Send our current field type predictions to the renderer. This is a no-op if
   // the appropriate command-line flag is not set.
   void SendAutofillTypePredictions(
       const std::vector<FormStructure*>& forms) const;
@@ skipping 61 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, SaneMetricsWithCacheMismatch);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_