Allow embedder to use custom cryptography in Autofill table.

components/autofill/core/browser/webdata/autofill_table.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_WEBDATA_AUTOFILL_TABLE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 11 matching lines @@
 
 namespace base {
 class Time;
 }
 
 namespace autofill {
 
 class AutofillChange;
 class AutofillEntry;
 class AutofillProfile;
+class AutofillTableEncryptor;
 class AutofillTableTest;
 class CreditCard;
 
 struct FormFieldData;
 
 // This class manages the various Autofill tables within the SQLite database
 // passed to the constructor. It expects the following schemas:
 //
 // Note: The database stores time in seconds, UTC.
 //
@@ skipping 202 matching lines @@
 //
 // autofill_model_type_state
 //                      Single row table that contains the sync ModelTypeState
 //                      for the autofill model type.
 //
 //   value              The serialized ModelTypeState record.
 
 class AutofillTable : public WebDatabaseTable {
  public:
   AutofillTable();
+  explicit AutofillTable(
+      std::unique_ptr<AutofillTableEncryptor> autofill_table_encryptor);

[Roger McFarlane (Chromium), 2017/02/22 22:50:52]

This additional public constructor seems redundant with the factory.

If the encryptor is exposed to the embedder via the factory delegate, then
there's not need for this constructor. the embedder just sets the delegate the
this class will do the right thing in getting the encryptor from the factory.

If the encryptor is taken as a constructor param, then the factory is redundant,
as the autofill construction call-sites could be updated by the embedder to
instantiate a different encryptor.

Is there a use case where this constructor is called, outside of constructor
delegation? If not, then just collapse this with the default constructor and
always use the factory.

[devarajn, 2017/02/22 23:10:54]

We can use this constructor to inject mocks in unit tests. Let me know what you
think?

[Roger McFarlane (Chromium), 2017/02/22 23:20:34]

The factory can also be used to inject mocks into the unittests, which also
serves to test the factory.

Let's get rid of this constructor.

[devarajn, 2017/02/22 23:26:05]

Alright. I will remove this constructor.

   ~AutofillTable() override;
 
   // Retrieves the AutofillTable* owned by |db|.
   static AutofillTable* FromWebDatabase(WebDatabase* db);
 
   // WebDatabaseTable:
   WebDatabaseTable::TypeKey GetTypeKey() const override;
   bool CreateTablesIfNecessary() override;
   bool IsSyncable() override;
   bool MigrateToVersion(int version, bool* update_compatible_version) override;
@@ skipping 196 matching lines @@
   bool MigrateToVersion67AddMaskedCardBillingAddress();
   bool MigrateToVersion70AddSyncMetadata();
   bool MigrateToVersion71AddHasConvertedAndBillingAddressIdMetadata();
 
   // Max data length saved in the table, AKA the maximum length allowed for
   // form data.
   // Copied to components/autofill/ios/browser/resources/autofill_controller.js.
   static const size_t kMaxDataLength;
 
  private:
+  std::unique_ptr<AutofillTableEncryptor> autofill_table_encryptor_;

[please use gerrit instead, 2017/02/22 22:34:58]

Please move the variable below all methods. (Line 553.)

[devarajn, 2017/02/22 23:10:54]

Acknowledged.

+
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_AddChanges);
   FRIEND_TEST_ALL_PREFIXES(
       AutofillTableTest,
       Autofill_GetCountOfValuesContainedBetween);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_RemoveBetweenChanges);
   FRIEND_TEST_ALL_PREFIXES(AutofillTableTest, Autofill_UpdateDontReplace);
   FRIEND_TEST_ALL_PREFIXES(
       AutofillTableTest,
       Autofill_RemoveFormElementsAddedBetween_UsedOnlyBefore);
@@ skipping 65 matching lines @@
   bool InitServerAddressMetadataTable();
   bool InitAutofillSyncMetadataTable();
   bool InitModelTypeStateTable();
 
   DISALLOW_COPY_AND_ASSIGN(AutofillTable);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_WEBDATA_AUTOFILL_TABLE_H_