USS: Introduce dependency of SharedModelTypeProcessor on ModelTypeService

sync/internal_api/sync_context_proxy_impl_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "sync/internal_api/public/activation_context.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/shared_model_type_processor.h"
 #include "sync/internal_api/public/sync_context.h"
+#include "sync/internal_api/public/test/fake_model_type_service.h"
 #include "sync/internal_api/sync_context_proxy_impl.h"
 #include "sync/sessions/model_type_registry.h"
 #include "sync/test/engine/mock_nudge_handler.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer_v2 {
 
-class SyncContextProxyImplTest : public ::testing::Test {
+class SyncContextProxyImplTest : public ::testing::Test, FakeModelTypeService {
  public:
   SyncContextProxyImplTest()
       : sync_task_runner_(base::ThreadTaskRunnerHandle::Get()),
         type_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
   void SetUp() override {
     dir_maker_.SetUp();
     registry_.reset(new syncer::ModelTypeRegistry(
         workers_, dir_maker_.directory(), &nudge_handler_));
     context_proxy_.reset(
@@ skipping 14 matching lines @@
     processor->Start(base::Bind(&SyncContextProxyImplTest::StartDone,
                                 base::Unretained(this)));
   }
 
   void StartDone(syncer::SyncError error,
                  scoped_ptr<ActivationContext> context) {
     context_proxy_->ConnectTypeToSync(syncer::THEMES, context.Pass());
   }
 
   scoped_ptr<SharedModelTypeProcessor> CreateModelTypeProcessor() {
-    return make_scoped_ptr(new SharedModelTypeProcessor(
-        syncer::THEMES, base::WeakPtr<ModelTypeStore>()));
+    return make_scoped_ptr(new SharedModelTypeProcessor(syncer::THEMES, this));
   }
 
  private:
   base::MessageLoop loop_;
   scoped_refptr<base::SingleThreadTaskRunner> sync_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> type_task_runner_;
 
   std::vector<scoped_refptr<syncer::ModelSafeWorker>> workers_;
   syncer::TestDirectorySetterUpper dir_maker_;
   syncer::MockNudgeHandler nudge_handler_;
@@ skipping 42 matching lines @@
   Start(processor.get());
 
   base::RunLoop run_loop_;
   run_loop_.RunUntilIdle();
 
   EXPECT_TRUE(processor->IsConnected());
   DisableSync();
 }
 
 }  // namespace syncer