Profile shouldn't own Session/TabRestore services.

chrome/browser/sync/profile_sync_service_session_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.
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/session_change_processor.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/profile_sync_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/protocol/session_specifics.pb.h"
@@ skipping 64 matching lines @@
       case NotificationType::FOREIGN_SESSION_UPDATED:
         notified_of_update_ = true;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   virtual void TearDown() {
-    if (profile()->GetSessionService() == service())
+    if (SessionServiceFactory::GetForProfileIfExisting(profile()) == service())
       helper_.ReleaseService(); // we transferred ownership to profile
     else
       helper_.set_service(NULL);
-    profile()->set_session_service(NULL);
+    SessionServiceFactory::SetForTestProfile(profile(), NULL);
     sync_service_.reset();
     profile()->ResetRequestContext();
     // Pump messages posted by the sync core thread (which may end up
     // posting on the IO thread).
     MessageLoop::current()->RunAllPending();
     io_thread_.Stop();
     MessageLoop::current()->RunAllPending();
     BrowserWithTestWindowTest::TearDown();
   }
 
   bool StartSyncService(Task* task, bool will_fail_association) {
     if (sync_service_.get())
       return false;
     sync_service_.reset(new TestProfileSyncService(
         &factory_, profile(), "test user", false, task));
-    profile()->set_session_service(helper_.service());
+    SessionServiceFactory::SetForTestProfile(profile(), helper_.service());
 
     // Register the session data type.
     model_associator_ =
         new SessionModelAssociator(sync_service_.get(),
                                    true /* setup_for_test */);
     change_processor_ = new SessionChangeProcessor(
         sync_service_.get(), model_associator_,
         true /* setup_for_test */);
     EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)).
         WillOnce(Return(ProfileSyncFactory::SyncComponents(
@@ skipping 304 matching lines @@
   ASSERT_FALSE(model_associator_->tab_pool_.full());
   for (size_t i = 0; i < num_ids; ++i) {
     model_associator_->tab_pool_.FreeTabNode(node_ids[i]);
   }
   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity());
   ASSERT_FALSE(model_associator_->tab_pool_.empty());
   ASSERT_TRUE(model_associator_->tab_pool_.full());
 }
 
 }  // namespace browser_sync