Improve autofill unit test

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 "base/utf_string_conversions.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 23 matching lines @@
   LOG(INFO) << "Associating Autofill Models";
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
 
   // TODO(zork): Attempt to load the model association from storage.
   std::vector<AutofillEntry> entries;
   if (!web_database_->GetAllAutofillEntries(&entries)) {
     LOG(ERROR) << "Could not get the autofill entries.";
     return false;
   }
 
-  int64 root_id;
-  if (!GetSyncIdForTaggedNode(kAutofillTag, &root_id)) {
-    sync_service_->OnUnrecoverableError();
-    LOG(ERROR) << "Server did not create the top-level autofill node. We "
-               << "might be running against an out-of-date server.";
-    return false;
-  }
-
   sync_api::WriteTransaction trans(
       sync_service_->backend()->GetUserShareHandle());
   sync_api::ReadNode autofill_root(&trans);
-  if (!autofill_root.InitByIdLookup(root_id)) {
+  if (!autofill_root.InitByTagLookup(kAutofillTag)) {
     error_handler_->OnUnrecoverableError();
     LOG(ERROR) << "Server did not create the top-level autofill node. We "
                << "might be running against an out-of-date server.";
     return false;
   }
 
   std::set<AutofillKey> current_entries;
   std::vector<AutofillEntry> new_entries;
 
   for (std::vector<AutofillEntry>::iterator ix = entries.begin();
@@ skipping 221 matching lines @@
 
   if (different) {
     new_timestamps->insert(new_timestamps->begin(),
                            timestamp_union.begin(),
                            timestamp_union.end());
   }
   return different;
 }
 
 }  // namespace browser_sync