Remove the very old code that migrated password data from the WebDataService to PasswordStore.

chrome/browser/webdata/web_data_service.h

 // Copyright (c) 2012 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
@@ skipping 30 matching lines @@
 class SkBitmap;
 class WebDatabase;
 
 namespace base {
 class Thread;
 }
 
 namespace webkit {
 namespace forms {
 struct FormField;
-struct PasswordForm;
 }
 }
 
 namespace webkit_glue {
 struct WebIntentServiceData;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService is a generic data repository for meta data associated with
@@ skipping 10 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 //
 // Result types
 //
 typedef enum {
   BOOL_RESULT = 1,             // WDResult<bool>
   KEYWORDS_RESULT,             // WDResult<WDKeywordsResult>
   INT64_RESULT,                // WDResult<int64>
-  PASSWORD_RESULT,             // WDResult<std::vector<PasswordForm*>>
 #if defined(OS_WIN)
   PASSWORD_IE7_RESULT,         // WDResult<IE7PasswordInfo>
 #endif
   WEB_APP_IMAGES,              // WDResult<WDAppImagesResult>
   TOKEN_RESULT,                // WDResult<std::vector<std::string>>
   AUTOFILL_VALUE_RESULT,       // WDResult<std::vector<string16>>
   AUTOFILL_CHANGES,            // WDResult<std::vector<AutofillChange>>
   AUTOFILL_PROFILE_RESULT,     // WDResult<AutofillProfile>
   AUTOFILL_PROFILES_RESULT,    // WDResult<std::vector<AutofillProfile*>>
   AUTOFILL_CREDITCARD_RESULT,  // WDResult<CreditCard>
@@ skipping 330 matching lines @@
   // Set a token to use for a specified service.
   void SetTokenForService(const std::string& service,
                           const std::string& token);
 
   // Remove all tokens stored in the web database.
   void RemoveAllTokens();
 
   // Null on failure. Success is WDResult<std::vector<std::string> >
   virtual Handle GetAllTokens(WebDataServiceConsumer* consumer);
 
+#if defined(OS_WIN)
   //////////////////////////////////////////////////////////////////////////////
   //
   // 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.

[stuartmorgan, 2012/04/26 08:06:13]

Remove the NOTE, and change "Password manager" to something IE-specific.

[Mike Mammarella, 2012/04/26 18:07:33]

Done.

   //
   //////////////////////////////////////////////////////////////////////////////
 
-  // Adds |form| to the list of remembered password forms.
-  void AddLogin(const webkit::forms::PasswordForm& form);
-
-  // Updates the remembered password form.
-  void UpdateLogin(const webkit::forms::PasswordForm& form);
-
-  // Removes |form| from the list of remembered password forms.
-  void RemoveLogin(const webkit::forms::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);
-
-  // Gets a list of password forms that match |form|.
-  // |consumer| will be notified when the request is done. The result is of
-  // type WDResult<std::vector<PasswordForm*>>.
-  // The result will be null on failure. The |consumer| owns all PasswordForm's.
-  Handle GetLogins(const webkit::forms::PasswordForm& form,
-                   WebDataServiceConsumer* consumer);
-
-  // Gets the complete list of password forms that have not been blacklisted and
-  // are thus auto-fillable.
-  // |consumer| will be notified when the request is done. The result is of
-  // type WDResult<std::vector<PasswordForm*>>.
-  // The result will be null on failure.  The |consumer| owns all PasswordForms.
-  Handle GetAutofillableLogins(WebDataServiceConsumer* consumer);
-
-  // Gets the complete list of password forms that have been blacklisted.
-  // |consumer| will be notified when the request is done. The result is of
-  // type WDResult<std::vector<PasswordForm*>>.
-  // The result will be null on failure. The |consumer| owns all PasswordForm's.
-  Handle GetBlacklistLogins(WebDataServiceConsumer* consumer);
-
-#if defined(OS_WIN)
   // Adds |info| to the list of imported passwords from ie7/ie8.
   void AddIE7Login(const IE7PasswordInfo& info);
 
   // Removes |info| from the list of imported passwords from ie7/ie8.
   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.
@@ skipping 190 matching lines @@
   //
   // Token Service.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   void RemoveAllTokensImpl(GenericRequest<std::string>* request);
   void SetTokenForServiceImpl(
     GenericRequest2<std::string, std::string>* request);
   void GetAllTokensImpl(GenericRequest<std::string>* request);
 
+#if defined(OS_WIN)
   //////////////////////////////////////////////////////////////////////////////
   //
   // Password manager.
   //
   //////////////////////////////////////////////////////////////////////////////
-  void AddLoginImpl(GenericRequest<webkit::forms::PasswordForm>* request);
-  void UpdateLoginImpl(GenericRequest<webkit::forms::PasswordForm>* request);
-  void RemoveLoginImpl(GenericRequest<webkit::forms::PasswordForm>* request);
-  void RemoveLoginsCreatedBetweenImpl(
-      GenericRequest2<base::Time, base::Time>* request);
-  void GetLoginsImpl(GenericRequest<webkit::forms::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.
   //
   //////////////////////////////////////////////////////////////////////////////
@@ skipping 74 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__