Refactor preference syncing.

chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index ee82421e9361bafcf6a0cc6d6ec12a338a1cbe11..7bbe498e834d6a2fe36de42ba17dc488d2ba2a57 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -314,10 +314,10 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
 
   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();
 
@@ -333,7 +333,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
     change_processor_.reset();
 
     EXPECT_TRUE(model_associator_->DisassociateModels());
-    model_associator_.reset();
+    model_associator_ = NULL;
 
     message_loop_.RunAllPending();
 
@@ -499,7 +499,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
   BrowserThread file_thread_;
 
   TestingProfile profile_;
-  scoped_ptr<TestBookmarkModelAssociator> model_associator_;
+  scoped_refptr<TestBookmarkModelAssociator> model_associator_;
 
  protected:
   BookmarkModel* model_;