Rest of the autofill work.

chrome/browser/sync/glue/autofill_change_processor.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/guid.h"
+#include "chrome/browser/autofill/personal_data_manager.h"

[tim (not reviewing), 2010/12/13 19:24:33]

alphabetical

[lipalani, 2010/12/15 09:08:33]

Done.

+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/glue/autofill_change_processor2.h"
 #include "chrome/browser/sync/glue/autofill_model_associator.h"
+#include "chrome/browser/sync/glue/autofill_profile_model_associator.h"
+#include "chrome/browser/sync/glue/do_optimistic_refresh_Task.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/common/pref_names.h"
 
 namespace browser_sync {
 
 struct AutofillChangeProcessor::AutofillChangeRecord {
   sync_api::SyncManager::ChangeRecord::Action action_;
   int64 id_;
   sync_pb::AutofillSpecifics autofill_;
   AutofillChangeRecord(sync_api::SyncManager::ChangeRecord::Action action,
                        int64 id, const sync_pb::AutofillSpecifics& autofill)
       : action_(action),
@@ skipping 44 matching lines @@
   }
 
   DCHECK(type.value == NotificationType::AUTOFILL_ENTRIES_CHANGED);
 
   AutofillChangeList* changes = Details<AutofillChangeList>(details).ptr();
   ObserveAutofillEntriesChanged(changes, &trans, autofill_root);
 }
 
 void AutofillChangeProcessor::PostOptimisticRefreshTask() {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      new AutofillModelAssociator::DoOptimisticRefreshTask(
+      new DoOptimisticRefreshForAutofill(
            personal_data_));
 }
 
 void AutofillChangeProcessor::ObserveAutofillEntriesChanged(
     AutofillChangeList* changes, sync_api::WriteTransaction* trans,
     const sync_api::ReadNode& autofill_root) {
   for (AutofillChangeList::iterator change = changes->begin();
        change != changes->end(); ++change) {
     switch (change->type()) {
       case AutofillChange::ADD:
@@ skipping 91 matching lines @@
 
 void AutofillChangeProcessor::ApplyChangesFromSyncModel(
     const sync_api::BaseTransaction* trans,
     const sync_api::SyncManager::ChangeRecord* changes,
     int change_count) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!running())
     return;
   StopObserving();
 
+  bool autofill_profile_not_migrated = HasNotMigratedYet(trans);
+
   sync_api::ReadNode autofill_root(trans);
   if (!autofill_root.InitByTagLookup(kAutofillTag)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
         "Autofill root node lookup failed.");
     return;
   }
 
   for (int i = 0; i < change_count; ++i) {
     sync_api::SyncManager::ChangeRecord::Action action(changes[i].action);
     if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE == action) {
       DCHECK(changes[i].specifics.HasExtension(sync_pb::autofill))
           << "Autofill specifics data not present on delete!";
       const sync_pb::AutofillSpecifics& autofill =
           changes[i].specifics.GetExtension(sync_pb::autofill);
       if (autofill.has_value() ||
-        (HasNotMigratedYet() && autofill.has_profile())) {
+        (autofill_profile_not_migrated && autofill.has_profile())) {
         autofill_changes_.push_back(AutofillChangeRecord(changes[i].action,
                                                          changes[i].id,
                                                          autofill));
       } else {
         NOTREACHED() << "Autofill specifics has no data!";
       }
       continue;
     }
 
     // Handle an update or add.
     sync_api::ReadNode sync_node(trans);
     if (!sync_node.InitByIdLookup(changes[i].id)) {
       error_handler()->OnUnrecoverableError(FROM_HERE,
           "Autofill node lookup failed.");
       return;
     }
 
     // Check that the changed node is a child of the autofills folder.
     DCHECK(autofill_root.GetId() == sync_node.GetParentId());
     DCHECK(syncable::AUTOFILL == sync_node.GetModelType());
 
     const sync_pb::AutofillSpecifics& autofill(
         sync_node.GetAutofillSpecifics());
     int64 sync_id = sync_node.GetId();
     if (autofill.has_value() ||
-      (HasNotMigratedYet() && autofill.has_profile())) {
+      (autofill_profile_not_migrated && autofill.has_profile())) {
       autofill_changes_.push_back(AutofillChangeRecord(changes[i].action,
                                                        sync_id, autofill));
     } else {
       NOTREACHED() << "Autofill specifics has no data!";
     }
   }
 
   StartObserving();
 }
 
 void AutofillChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!running())
     return;
   StopObserving();
 
   std::vector<AutofillEntry> new_entries;
   for (unsigned int i = 0; i < autofill_changes_.size(); i++) {
     // Handle deletions.
     if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
         autofill_changes_[i].action_) {
       if (autofill_changes_[i].autofill_.has_value()) {
         ApplySyncAutofillEntryDelete(autofill_changes_[i].autofill_);
       } else if (autofill_changes_[i].autofill_.has_profile()) {
-        DCHECK(HasNotMigratedYet());
         ApplySyncAutofillProfileDelete(autofill_changes_[i].id_);
       } else {
         NOTREACHED() << "Autofill's CommitChanges received change with no"
             " data!";
       }
       continue;
     }
 
     // Handle update/adds.
     if (autofill_changes_[i].autofill_.has_value()) {
       ApplySyncAutofillEntryChange(autofill_changes_[i].action_,
                                    autofill_changes_[i].autofill_, &new_entries,
                                    autofill_changes_[i].id_);
     } else if (autofill_changes_[i].autofill_.has_profile()) {
-      DCHECK(HasNotMigratedYet());
       ApplySyncAutofillProfileChange(autofill_changes_[i].action_,
                                      autofill_changes_[i].autofill_.profile(),
                                      autofill_changes_[i].id_);
     } else {
       NOTREACHED() << "Autofill's CommitChanges received change with no data!";
     }
   }
   autofill_changes_.clear();
 

[tim (not reviewing), 2010/12/13 19:24:33]

extra newline

[lipalani, 2010/12/15 09:08:33]

Done.

+
   // Make changes
   if (!web_database_->UpdateAutofillEntries(new_entries)) {
     error_handler()->OnUnrecoverableError(FROM_HERE,
                                           "Could not update autofill entries.");
     return;
   }
 
   PostOptimisticRefreshTask();
 
   StartObserving();
@@ skipping 127 matching lines @@
   autofill.set_name(UTF16ToUTF8(entry.key().name()));
   autofill.set_value(UTF16ToUTF8(entry.key().value()));
   const std::vector<base::Time>& ts(entry.timestamps());
   for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
        timestamp != ts.end(); ++timestamp) {
     autofill.add_usage_timestamp(timestamp->ToInternalValue());
   }
   node->SetAutofillSpecifics(autofill);
 }
 
-// static
-void AutofillChangeProcessor::WriteAutofillProfile(
-    const AutoFillProfile& profile, sync_api::WriteNode* node) {
-  sync_pb::AutofillSpecifics autofill;
-  sync_pb::AutofillProfileSpecifics* s(autofill.mutable_profile());
-  s->set_name_first(UTF16ToUTF8(
-      profile.GetFieldText(AutoFillType(NAME_FIRST))));
-  s->set_name_middle(UTF16ToUTF8(
-      profile.GetFieldText(AutoFillType(NAME_MIDDLE))));
-  s->set_name_last(UTF16ToUTF8(profile.GetFieldText(AutoFillType(NAME_LAST))));
-  s->set_address_home_line1(
-      UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE1))));
-  s->set_address_home_line2(
-      UTF16ToUTF8(profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE2))));
-  s->set_address_home_city(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(ADDRESS_HOME_CITY))));
-  s->set_address_home_state(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(ADDRESS_HOME_STATE))));
-  s->set_address_home_country(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(ADDRESS_HOME_COUNTRY))));
-  s->set_address_home_zip(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(ADDRESS_HOME_ZIP))));
-  s->set_email_address(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(EMAIL_ADDRESS))));
-  s->set_company_name(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(COMPANY_NAME))));
-  s->set_phone_fax_whole_number(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(PHONE_FAX_WHOLE_NUMBER))));
-  s->set_phone_home_whole_number(UTF16ToUTF8(profile.GetFieldText(
-      AutoFillType(PHONE_HOME_WHOLE_NUMBER))));
-  node->SetAutofillSpecifics(autofill);
-}
-bool AutofillChangeProcessor::HasNotMigratedYet() {
-  return true;
+bool AutofillChangeProcessor::HasNotMigratedYet(
+    const sync_api::BaseTransaction* trans) {
+  return model_associator_->HasNotMigratedYet(trans);
 }
 
 }  // namespace browser_sync
+

[tim (not reviewing), 2010/12/13 19:24:33]

extra newline

[lipalani, 2010/12/15 09:08:33]

Done.