Rest of the autofill work.

chrome/browser/sync/glue/autofill_model_associator.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_model_associator.h"
 
 #include <vector>
 
 #include "base/task.h"
 #include "base/time.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/guid.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.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/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/web_database.h"
+#include "chrome/common/pref_names.h"
 #include "net/base/escape.h"
 
 using base::TimeTicks;
 
 namespace browser_sync {
 
 const char kAutofillTag[] = "google_chrome_autofill";
 const char kAutofillEntryNamespaceTag[] = "autofill_entry|";
 
 struct AutofillModelAssociator::DataBundle {
   std::set<AutofillKey> current_entries;
   std::vector<AutofillEntry> new_entries;
   std::set<string16> current_profiles;
   std::vector<AutoFillProfile*> updated_profiles;
   std::vector<AutoFillProfile*> new_profiles;  // We own these pointers.
   ~DataBundle() { STLDeleteElements(&new_profiles); }
 };
 
-AutofillModelAssociator::DoOptimisticRefreshTask::DoOptimisticRefreshTask(
-    PersonalDataManager* pdm) : pdm_(pdm) {}
-
-AutofillModelAssociator::DoOptimisticRefreshTask::~DoOptimisticRefreshTask() {}
-
-void AutofillModelAssociator::DoOptimisticRefreshTask::Run() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  pdm_->Refresh();
-}
-
 AutofillModelAssociator::AutofillModelAssociator(
     ProfileSyncService* sync_service,
     WebDatabase* web_database,
     PersonalDataManager* personal_data)
     : sync_service_(sync_service),
       web_database_(web_database),
       personal_data_(personal_data),
       autofill_node_id_(sync_api::kInvalidId),
       abort_association_pending_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
@@ skipping 54 matching lines @@
       node.SetTitle(UTF8ToWide(tag));
       AutofillChangeProcessor::WriteAutofillEntry(*ix, &node);
       Associate(&tag, node.GetId());
     }
 
     current_entries->insert(ix->key());
   }
   return true;
 }
 
-bool AutofillModelAssociator::MakeNewAutofillProfileSyncNode(
-    sync_api::WriteTransaction* trans, const sync_api::BaseNode& autofill_root,
-    const std::string& tag, const AutoFillProfile& profile, int64* sync_id) {
-  sync_api::WriteNode node(trans);
-  if (!node.InitUniqueByCreation(syncable::AUTOFILL, autofill_root, tag)) {
-    LOG(ERROR) << "Failed to create autofill sync node.";
-    return false;
-  }
-  node.SetTitle(UTF8ToWide(tag));
-  AutofillChangeProcessor::WriteAutofillProfile(profile, &node);
-  *sync_id = node.GetId();
-  return true;
-}
-
-
 bool AutofillModelAssociator::LoadAutofillData(
     std::vector<AutofillEntry>* entries,
     std::vector<AutoFillProfile*>* profiles) {
   if (IsAbortPending())
     return false;
   if (!web_database_->GetAllAutofillEntries(entries))
     return false;
 
   if (IsAbortPending())
     return false;
@@ skipping 101 matching lines @@
     if (!sync_child.InitByIdLookup(sync_child_id)) {
       LOG(ERROR) << "Failed to fetch child node.";
       return false;
     }
     const sync_pb::AutofillSpecifics& autofill(
         sync_child.GetAutofillSpecifics());
 
     if (autofill.has_value())
       AddNativeEntryIfNeeded(autofill, bundle, sync_child);
     // Ignore autofill profiles if we are not upgrading.
-    else if (autofill.has_profile() && IsUpgrading()) {
+    else if (autofill.has_profile() && IsUpgrading(write_trans)) {
       AddNativeProfileIfNeeded(
           autofill.profile(),
           bundle,
           sync_child,
           all_profiles_from_db);
     } else {
       NOTREACHED() << "AutofillSpecifics has no autofill data!";
     }
 
     sync_child_id = sync_child.GetSuccessorId();
@@ skipping 65 matching lines @@
 }
 
 void AutofillModelAssociator::AddNativeProfileIfNeeded(
     const sync_pb::AutofillProfileSpecifics& profile,
     DataBundle* bundle,
     const sync_api::ReadNode& node,
     std::vector<AutoFillProfile*>& all_profiles_from_db) {
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
-  scoped_ptr<AutoFillProfile> profile_in_web_db(FindCorrespondingNodeFromWebDB(
-      profile, all_profiles_from_db));
+  AutoFillProfile* profile_in_web_db = FindCorrespondingNodeFromWebDB(
+      profile, all_profiles_from_db);
 
-  if (profile_in_web_db.get() != NULL) {
+  if (profile_in_web_db != NULL) {
     int64 sync_id = node.GetId();
     Associate(&(profile_in_web_db->guid()), sync_id);
     return;
   } else { // Create a new node.
     std::string guid = guid::GenerateGUID();
     Associate(&guid, node.GetId());
     AutoFillProfile* p = new AutoFillProfile(guid);
     OverwriteProfileWithServerData(p, profile);
     bundle->new_profiles.push_back(p);
   }
@@ skipping 153 matching lines @@
   diff = MergeField(p, ADDRESS_HOME_ZIP, s.address_home_zip()) || diff;
   diff = MergeField(p, EMAIL_ADDRESS, s.email_address()) || diff;
   diff = MergeField(p, COMPANY_NAME, s.company_name()) || diff;
   diff = MergeField(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number())
       || diff;
   diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
       || diff;
   return diff;
 }
 
-bool AutofillModelAssociator::IsUpgrading()
-{
-  return true;
+bool AutofillModelAssociator::IsUpgrading(sync_api::WriteTransaction* trans) {
+

[lipalani, 2010/12/08 21:37:46]

call the fn in model associator.

+  sync_api::ReadNode node(trans);
+
+  return !node.InitByClientTagLookup(syncable::AUTOFILL_PROFILE, 
+      kAutofillProfileTag);
 }
 
 }  // namespace browser_sync