Make some improvements to sync model associator:...

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2006-2008 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.
 
 #if defined(BROWSER_SYNC)
 
 #include <stack>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 1219 matching lines @@
   StartSyncService();
   ExpectModelMatch();
   // Force the sync service to shut down and write itself to disk.
   StopSyncService(SAVE_TO_STORAGE);
   // Now restart the sync service. This time it should use the persistent
   // assocations.
   StartSyncService();
   ExpectModelMatch();
 }
 
+// Tests that when persisted model assocations are used, things work fine.
+TEST_F(ProfileSyncServiceTestWithData, ModelAssociationInvalidPersistence) {
+  LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
+  WriteTestDataToBookmarkModel();
+  StartSyncService();
+  ExpectModelMatch();
+  // Force the sync service to shut down and write itself to disk.
+  StopSyncService(SAVE_TO_STORAGE);
+  // Change the bookmark model before restarting sync service to simulate
+  // the situation where bookmark model is different from sync model and
+  // make sure model associator correctly rebuilds associations.
+  const BookmarkNode* bookmark_bar_node = model_->GetBookmarkBarNode();
+  model_->AddURL(bookmark_bar_node, 0, L"xtra", GURL("http://www.xtra.com"));
+  // Now restart the sync service. This time it will try to use the persistent
+  // associations and realize that they are invalid and hence will rebuild
+  // associations.
+  StartSyncService();
+  ExpectModelMatch();
+}
+
 TEST_F(ProfileSyncServiceTestWithData, SortChildren) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSyncService();
 
   // Write test data to bookmark model and verify that the models match.
   WriteTestDataToBookmarkModel();
   const BookmarkNode* folder_added = model_->other_node()->GetChild(0);
   ASSERT_TRUE(folder_added);
   ASSERT_TRUE(folder_added->is_folder());
 
@@ skipping 27 matching lines @@
   StartSyncService();
 
   // Make sure we're back in sync.  In real life, the user would need
   // to reauthenticate before this happens, but in the test, authentication
   // is sidestepped.
   ExpectBookmarkModelMatchesTestData();
   ExpectModelMatch();
 }
 
 #endif  // defined(BROWSER_SYNC)