Refactor preference syncing.

chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

 // Copyright (c) 2011 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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stack>
 #include <vector>
@@ skipping 296 matching lines @@
     // Wait for the bookmarks model to load.
     profile_.BlockUntilBookmarkModelLoaded();
     // This noticeably speeds up the unit tests that request it.
     if (save == DONT_SAVE_TO_STORAGE)
       model_->ClearStore();
     message_loop_.RunAllPending();
   }
 
   void StartSync() {
     // Set up model associator.
-    model_associator_.reset(new TestBookmarkModelAssociator(
+    model_associator_ = new TestBookmarkModelAssociator(
         profile_.GetBookmarkModel(),
         test_user_share_.user_share(),
-        &mock_unrecoverable_error_handler_));
+        &mock_unrecoverable_error_handler_);
     EXPECT_TRUE(model_associator_->AssociateModels());
     MessageLoop::current()->RunAllPending();
 
     // Set up change processor.
     change_processor_.reset(
         new BookmarkChangeProcessor(model_associator_.get(),
                                     &mock_unrecoverable_error_handler_));
     change_processor_->Start(&profile_, test_user_share_.user_share());
   }
 
   void StopSync() {
     change_processor_->Stop();
     change_processor_.reset();
 
     EXPECT_TRUE(model_associator_->DisassociateModels());
-    model_associator_.reset();
+    model_associator_ = NULL;
 
     message_loop_.RunAllPending();
 
     // TODO(akalin): Actually close the database and flush it to disk
     // (and make StartSync reload from disk).  This would require
     // refactoring TestUserShare.
   }
 
   void UnloadBookmarkModel() {
     profile_.CreateBookmarkModel(false /* delete_bookmarks */);
@@ skipping 145 matching lines @@
   }
 
  private:
   // Used by both |ui_thread_| and |file_thread_|.
   MessageLoop message_loop_;
   BrowserThread ui_thread_;
   // Needed by |model_|.
   BrowserThread file_thread_;
 
   TestingProfile profile_;
-  scoped_ptr<TestBookmarkModelAssociator> model_associator_;
+  scoped_refptr<TestBookmarkModelAssociator> model_associator_;
 
  protected:
   BookmarkModel* model_;
   TestUserShare test_user_share_;
   scoped_ptr<BookmarkChangeProcessor> change_processor_;
   StrictMock<MockUnrecoverableErrorHandler> mock_unrecoverable_error_handler_;
 };
 
 TEST_F(ProfileSyncServiceBookmarkTest, InitialState) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
@@ skipping 840 matching lines @@
   // 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();
 }
 
 }  // namespace
 
 }  // namespace browser_sync