sync: Consistently refcount ModelSafeWorkers

sync/sessions/sync_session_unittest.cc

 // Copyright 2012 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 "sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
         new FakeModelWorker(GROUP_PASSIVE));
     scoped_refptr<ModelSafeWorker> ui_worker(
         new FakeModelWorker(GROUP_UI));
     scoped_refptr<ModelSafeWorker> db_worker(
         new FakeModelWorker(GROUP_DB));
     workers_.clear();
     workers_.push_back(passive_worker);
     workers_.push_back(ui_worker);
     workers_.push_back(db_worker);
 
-    std::vector<ModelSafeWorker*> workers;
-    GetWorkers(&workers);
-
     context_.reset(
         new SyncSessionContext(
             NULL,
             NULL,
-            workers,
+            workers_,
             extensions_activity_.get(),
             std::vector<SyncEngineEventListener*>(),
             NULL,
             NULL,
             true,  // enable keystore encryption
             false,  // force enable pre-commit GU avoidance experiment
             "fake_invalidator_client_id"));
     context_->set_routing_info(routes_);
 
     session_.reset(MakeSession());
@@ skipping 30 matching lines @@
   virtual void OnReceivedClientInvalidationHintBufferSize(
       int size) OVERRIDE {
     FailControllerInvocationIfDisabled(
         "OnReceivedClientInvalidationHintBufferSize");
   }
   virtual void OnSyncProtocolError(
       const sessions::SyncSessionSnapshot& snapshot) OVERRIDE {
     FailControllerInvocationIfDisabled("SyncProtocolError");
   }
 
-  void GetWorkers(std::vector<ModelSafeWorker*>* out) const {
-    out->clear();
-    for (std::vector<scoped_refptr<ModelSafeWorker> >::const_iterator it =
-             workers_.begin(); it != workers_.end(); ++it) {
-      out->push_back(it->get());
-    }
-  }
   void GetModelSafeRoutingInfo(ModelSafeRoutingInfo* out) const {
     *out = routes_;
   }
 
   StatusController* status() { return session_->mutable_status_controller(); }
  protected:
   void FailControllerInvocationIfDisabled(const std::string& msg) {
     if (!controller_invocations_allowed_)
       FAIL() << msg;
   }
@@ skipping 12 matching lines @@
   scoped_ptr<SyncSession> session_;
   scoped_ptr<SyncSessionContext> context_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   ModelSafeRoutingInfo routes_;
   scoped_refptr<ExtensionsActivity> extensions_activity_;
 };
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer