Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2031)

Unified Diff: components/autofill/core/browser/webdata/autofill_table.cc

Issue 2660673002: [Sync] Not having an autocomplete ModelTypeState is valid. (Closed)
Patch Set: Update AutocompleteSyncBridge unittests to not rely on initial metadata. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/autofill/core/browser/webdata/autofill_table.cc
diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
index 503eb0fa9e71fa93d8027215685a2a9a1dec91fa..cdcfde85269735c57e4a5734829627d084a7c738 100644
--- a/components/autofill/core/browser/webdata/autofill_table.cc
+++ b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -11,8 +11,7 @@
#include <limits>
#include <map>
#include <set>
-#include <string>
-#include <vector>
+#include <utility>
#include "base/command_line.h"
#include "base/guid.h"
@@ -36,7 +35,6 @@
#include "components/autofill/core/common/form_field_data.h"
#include "components/os_crypt/os_crypt.h"
#include "components/sync/base/model_type.h"
-#include "components/sync/model/metadata_batch.h"
#include "components/sync/protocol/entity_metadata.pb.h"
#include "components/sync/protocol/model_type_state.pb.h"
#include "components/webdata/common/web_database.h"
@@ -1686,7 +1684,7 @@ bool AutofillTable::GetAllSyncMetadata(syncer::ModelType model_type,
syncer::EntityMetadataMap metadata_records;
if (GetAllSyncEntityMetadata(model_type, &metadata_records)) {
for (const auto& pair : metadata_records) {
- // todo(pnoland): add batch transfer of metadata map
+ // TODO(pnoland): Add batch transfer of metadata map.
metadata_batch->AddMetadata(pair.first, pair.second);
}
} else {
@@ -1762,7 +1760,7 @@ bool AutofillTable::GetModelTypeState(syncer::ModelType model_type,
"SELECT value FROM autofill_model_type_state WHERE id=1"));
if (!s.Step()) {
- return false;
+ return true;
}
std::string serialized_state = s.ColumnString(0);
@@ -2527,4 +2525,4 @@ bool AutofillTable::
return transaction.Commit();
}
-} // namespace autofill
+} // namespace autofill

Powered by Google App Engine
This is Rietveld 408576698