Unit test for autofill sync.

Including some changes to make things testable, including adding WebDatabase* to the ctor of the MA and PC, plus making some methods virtual on WebDatabase.

Review URL: http://codereview.chromium.org/661316

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40359 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index c6887f4..004532a 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -448,10 +448,12 @@ class WebDataService
   void set_failed_init(bool value) { failed_init_ = value; }
 #endif
 
-  bool IsDatabaseLoaded();
-  WebDatabase* GetDatabase();
+  virtual bool IsDatabaseLoaded();
+  virtual WebDatabase* GetDatabase();
 
  protected:
+  virtual ~WebDataService();
+
   friend class TemplateURLModelTest;
   friend class TemplateURLModelTestingProfile;
   friend class WebDataServiceTest;
@@ -480,8 +482,6 @@ class WebDataService
   typedef GenericRequest2<std::vector<const TemplateURL*>,
                           std::vector<TemplateURL*> > SetKeywordsRequest;
 
-  ~WebDataService();
-
   // Invoked on the main thread if initializing the db fails.
   void DBInitFailed(sql::InitStatus init_status);
 
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 6d1a99d..06727e9 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -44,7 +44,7 @@ struct IE7PasswordInfo;
 class WebDatabase {
  public:
   WebDatabase();
-  ~WebDatabase();
+  virtual ~WebDatabase();
 
   // Initialize the database given a name. The name defines where the sqlite
   // file is. If this returns an error code, no other method should be called.
@@ -201,20 +201,20 @@ class WebDatabase {
   bool RemoveFormElementForID(int64 pair_id);
 
   // Removes row from the autofill tables for the given |name| |value| pair.
-  bool RemoveFormElement(const string16& name, const string16& value);
+  virtual bool RemoveFormElement(const string16& name, const string16& value);
 
   // Retrieves all of the entries in the autofill table.
-  bool GetAllAutofillEntries(std::vector<AutofillEntry>* entries);
+  virtual bool GetAllAutofillEntries(std::vector<AutofillEntry>* entries);
 
   // Retrieves a single entry from the autofill table.
-  bool GetAutofillTimestamps(const string16& name,
+  virtual bool GetAutofillTimestamps(const string16& name,
                              const string16& value,
                              std::vector<base::Time>* timestamps);
 
   // Replaces existing autofill entries with the entries supplied in
   // the argument.  If the entry does not already exist, it will be
   // added.
-  bool UpdateAutofillEntries(const std::vector<AutofillEntry>& entries);
+  virtual bool UpdateAutofillEntries(const std::vector<AutofillEntry>& entries);
 
   // Records a single AutoFill profile in the autofill_profiles table.
   bool AddAutoFillProfile(const AutoFillProfile& profile);