Cleanup: Order the methods in WebDataService. Rename a method to match current style.

chrome/browser/webdata/web_data_service.h

 // Copyright (c) 2009 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_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 
 #include <map>
 #include <vector>
 
@@ skipping 138 matching lines @@
   mutable T value_;
   DISALLOW_EVIL_CONSTRUCTORS(WDObjectResult);
 };
 
 class WebDataServiceConsumer;
 
 class WebDataService
     : public base::RefCountedThreadSafe<WebDataService,
                                         ChromeThread::DeleteOnUIThread> {
  public:
-
   // All requests return an opaque handle of the following type.
   typedef int Handle;
 
-  WebDataService();
-
-  // Initializes the web data service. Returns false on failure
-  // Takes the path of the profile directory as its argument.
-  bool Init(const FilePath& profile_path);
-
-  // Shutdown the web data service. The service can no longer be used after this
-  // call.
-  void Shutdown();
-
-  // Returns false if Shutdown() has been called.
-  bool IsRunning() const;
-
-  // Unloads the database without actually shutting down the service.  This can
-  // be used to temporarily reduce the browser process' memory footprint.
-  void UnloadDatabase();
-
   //////////////////////////////////////////////////////////////////////////////
   //
   // Internal requests
   //
   // Every request is processed using a request object. The object contains
   // both the request parameters and the results.
   //////////////////////////////////////////////////////////////////////////////
   class WebDataRequest {
    public:
     WebDataRequest(WebDataService* service,
@@ skipping 76 matching lines @@
 
     U GetArgument2() {
       return arg2_;
     }
 
    private:
     T arg1_;
     U arg2_;
   };
 
+  WebDataService();
+
+  // Initializes the web data service. Returns false on failure
+  // Takes the path of the profile directory as its argument.
+  bool Init(const FilePath& profile_path);
+
+  // Shutdown the web data service. The service can no longer be used after this
+  // call.
+  void Shutdown();
+
+  // Returns false if Shutdown() has been called.
+  bool IsRunning() const;
+
+  // Unloads the database without actually shutting down the service.  This can
+  // be used to temporarily reduce the browser process' memory footprint.
+  void UnloadDatabase();
+
+  // Cancel any pending request. You need to call this method if your
+  // WebDataServiceConsumer is about to be deleted.
+  void CancelRequest(Handle h);
+
+  virtual bool IsDatabaseLoaded();
+  virtual WebDatabase* GetDatabase();
+
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords
   //
   //////////////////////////////////////////////////////////////////////////////
 
   // As the database processes requests at a later date, all deletion is
   // done on the background thread.
   //
   // Many of the keyword related methods do not return a handle. This is because
@@ skipping 38 matching lines @@
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Password manager
   // NOTE: These methods are all deprecated; new clients should use
   // PasswordStore. These are only still here because Windows is (temporarily)
   // still using them for its PasswordStore implementation.
   //
   //////////////////////////////////////////////////////////////////////////////
 
+  // Adds |form| to the list of remembered password forms.
+  void AddLogin(const webkit_glue::PasswordForm& form);
+
   // Updates the remembered password form.
   void UpdateLogin(const webkit_glue::PasswordForm& form);
 
-  // Adds |form| to the list of remembered password forms.
-  void AddLogin(const webkit_glue::PasswordForm& form);
-
   // Removes |form| from the list of remembered password forms.
   void RemoveLogin(const webkit_glue::PasswordForm& form);
 
   // Removes all logins created in the specified daterange
   void RemoveLoginsCreatedBetween(const base::Time& delete_begin,
                                   const base::Time& delete_end);
 
   // Removes all logins created on or after the date passed in.
   void RemoveLoginsCreatedAfter(const base::Time& delete_begin);
 
@@ skipping 25 matching lines @@
   void RemoveIE7Login(const IE7PasswordInfo& info);
 
   // Get the login matching the information in |info|. |consumer| will be
   // notified when the request is done. The result is of type
   // WDResult<IE7PasswordInfo>.
   // If there is no match, the fields of the IE7PasswordInfo will be empty.
   Handle GetIE7Login(const IE7PasswordInfo& info,
                      WebDataServiceConsumer* consumer);
 #endif  // defined(OS_WIN)
 
-  // Cancel any pending request. You need to call this method if your
-  // WebDataServiceConsumer is about to be deleted.
-  void CancelRequest(Handle h);
-
   //////////////////////////////////////////////////////////////////////////////
   //
-  // Autofill.
+  // AutoFill.
   //
   //////////////////////////////////////////////////////////////////////////////
 
-  // Schedules a task to add form elements to the web database.
-  void AddFormFieldValues(
-      const std::vector<webkit_glue::FormField>& elements);
+  // Schedules a task to add form fields to the web database.
+  void AddFormFields(const std::vector<webkit_glue::FormField>& fields);
 
   // Initiates the request for a vector of values which have been entered in
   // form input fields named |name|.  The method OnWebDataServiceRequestDone of
   // |consumer| gets called back when the request is finished, with the vector
   // included in the argument |result|.
   Handle GetFormValuesForElementName(const string16& name,
                                      const string16& prefix,
                                      int limit,
                                      WebDataServiceConsumer* consumer);
 
-  // Removes form elements recorded for autofill from the database.
+  // Removes form elements recorded for Autocomplete from the database.
   void RemoveFormElementsAddedBetween(const base::Time& delete_begin,
                                       const base::Time& delete_end);
   void RemoveFormValueForElementName(const string16& name,
                                      const string16& value);
 
   // Schedules a task to add an AutoFill profile to the web database.
   void AddAutoFillProfile(const AutoFillProfile& profile);
 
   // Schedules a task to update an AutoFill profile in the web database.
   void UpdateAutoFillProfile(const AutoFillProfile& profile);
@@ skipping 22 matching lines @@
   // OnWebDataServiceRequestDone of |consumer| gets called when the request is
   // finished, with the credit cards included in the argument |result|.  The
   // consumer owns the credit cards.
   Handle GetCreditCards(WebDataServiceConsumer* consumer);
 
   // Testing
 #ifdef UNIT_TEST
   void set_failed_init(bool value) { failed_init_ = value; }
 #endif
 
-  virtual bool IsDatabaseLoaded();
-  virtual WebDatabase* GetDatabase();
-
  protected:
-  virtual ~WebDataService();
-
   friend class TemplateURLModelTest;
   friend class TemplateURLModelTestingProfile;
   friend class WebDataServiceTest;
   friend class WebDataRequest;
 
+  virtual ~WebDataService();
+
   // This is invoked by the unit test; path is the path of the Web Data file.
   bool InitWithPath(const FilePath& path);
 
   // Invoked by request implementations when a request has been processed.
   void RequestCompleted(Handle h);
 
   // Register the request as a pending request.
   void RegisterRequest(WebDataRequest* request);
 
   //////////////////////////////////////////////////////////////////////////////
@@ skipping 18 matching lines @@
 
   // The notification method.
   void NotifyDatabaseLoadedOnUIThread();
 
   // Commit any pending transaction and deletes the database.
   void ShutdownDatabase();
 
   // Commit the current transaction and creates a new one.
   void Commit();
 
+  // Schedule a task on our worker thread.
+  void ScheduleTask(Task* t);
+
+  // Schedule a commit if one is not already pending.
+  void ScheduleCommit();
+
+  // Return the next request handle.
+  int GetNextRequestHandle();
+
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddKeywordImpl(GenericRequest<TemplateURL>* request);
   void RemoveKeywordImpl(GenericRequest<TemplateURL::IDType>* request);
   void UpdateKeywordImpl(GenericRequest<TemplateURL>* request);
   void GetKeywordsImpl(WebDataRequest* request);
   void SetDefaultSearchProviderImpl(GenericRequest<TemplateURL::IDType>* r);
   void SetBuiltinKeywordVersionImpl(GenericRequest<int>* r);
 
   //////////////////////////////////////////////////////////////////////////////
   //
+  // Web Apps.
+  //
+  //////////////////////////////////////////////////////////////////////////////
+  void SetWebAppImageImpl(GenericRequest2<GURL, SkBitmap>* request);
+  void SetWebAppHasAllImagesImpl(GenericRequest2<GURL, bool>* request);
+  void RemoveWebAppImpl(GenericRequest<GURL>* request);
+  void GetWebAppImagesImpl(GenericRequest<GURL>* request);
+
+  //////////////////////////////////////////////////////////////////////////////
+  //
   // Password manager.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddLoginImpl(GenericRequest<webkit_glue::PasswordForm>* request);
   void UpdateLoginImpl(GenericRequest<webkit_glue::PasswordForm>* request);
   void RemoveLoginImpl(GenericRequest<webkit_glue::PasswordForm>* request);
   void RemoveLoginsCreatedBetweenImpl(
       GenericRequest2<base::Time, base::Time>* request);
   void GetLoginsImpl(GenericRequest<webkit_glue::PasswordForm>* request);
   void GetAutofillableLoginsImpl(WebDataRequest* request);
   void GetBlacklistLoginsImpl(WebDataRequest* request);
 #if defined(OS_WIN)
   void AddIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
   void RemoveIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
   void GetIE7LoginImpl(GenericRequest<IE7PasswordInfo>* request);
 #endif  // defined(OS_WIN)
 
   //////////////////////////////////////////////////////////////////////////////
   //
-  // Autofill.
+  // AutoFill.
   //
   //////////////////////////////////////////////////////////////////////////////
-  void AddFormFieldValuesImpl(
+  void AddFormElementsImpl(
       GenericRequest<std::vector<webkit_glue::FormField> >* request);
   void GetFormValuesForElementNameImpl(WebDataRequest* request,
       const string16& name, const string16& prefix, int limit);
   void RemoveFormElementsAddedBetweenImpl(
       GenericRequest2<base::Time, base::Time>* request);
   void RemoveFormValueForElementNameImpl(
       GenericRequest2<string16, string16>* request);
   void AddAutoFillProfileImpl(GenericRequest<AutoFillProfile>* request);
   void UpdateAutoFillProfileImpl(GenericRequest<AutoFillProfile>* request);
   void RemoveAutoFillProfileImpl(GenericRequest<int>* request);
-  void GetAutoFillProfileForLabelImpl(WebDataRequest* request,
-                                      const string16& label);
   void GetAutoFillProfilesImpl(WebDataRequest* request);
   void AddCreditCardImpl(GenericRequest<CreditCard>* request);
   void UpdateCreditCardImpl(GenericRequest<CreditCard>* request);
   void RemoveCreditCardImpl(GenericRequest<int>* request);
-  void GetCreditCardForLabelImpl(WebDataRequest* request,
-                                 const string16& label);
   void GetCreditCardsImpl(WebDataRequest* request);
 
-  //////////////////////////////////////////////////////////////////////////////
-  //
-  // Web Apps.
-  //
-  //////////////////////////////////////////////////////////////////////////////
-
-  void SetWebAppImageImpl(GenericRequest2<GURL, SkBitmap>* request);
-
-  void SetWebAppHasAllImagesImpl(GenericRequest2<GURL, bool>* request);
-
-  void RemoveWebAppImpl(GenericRequest<GURL>* request);
-
-  void GetWebAppImagesImpl(GenericRequest<GURL>* request);
-
-  // Schedule a task on our worker thread.
-  void ScheduleTask(Task* t);
-
-  // Schedule a commit if one is not already pending.
-  void ScheduleCommit();
-
-  // Return the next request handle.
-  int GetNextRequestHandle();
-
   // True once initialization has started.
   bool is_running_;
 
   // The path with which to initialize the database.
   FilePath path_;
 
   // Our database.
   WebDatabase* db_;
 
   // Whether the database failed to initialize.  We use this to avoid
@@ skipping 34 matching lines @@
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 
  protected:
   virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__