Create profile_sync_test_util in components

chrome/browser/sync/test_profile_sync_service.cc

 // Copyright (c) 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 "chrome/browser/sync/test_profile_sync_service.h"
 
 #include <utility>
 
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
 #include "chrome/common/channel_info.h"
+#include "components/browser_sync/browser/profile_sync_test_util.h"
 #include "components/invalidation/impl/profile_invalidation_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/sync_driver/glue/sync_backend_host.h"
 #include "components/sync_driver/glue/sync_backend_host_core.h"
 #include "components/sync_driver/signin_manager_wrapper.h"
 #include "components/sync_driver/sync_api_component_factory_mock.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/internal_api/public/test/sync_manager_factory_for_profile_sync_test.h"
 #include "sync/internal_api/public/test/test_internal_components_factory.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/protocol/encryption.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using content::BrowserThread;
 using syncer::InternalComponentsFactory;
 using syncer::TestInternalComponentsFactory;
 using syncer::UserShare;
 
 namespace {
 
 ProfileSyncService::InitParams GetInitParams(
     Profile* profile,
     SigninManagerBase* signin,
     ProfileOAuth2TokenService* oauth2_token_service,
     browser_sync::ProfileSyncServiceStartBehavior behavior) {
-  ProfileSyncService::InitParams init_params =
-      CreateProfileSyncServiceParamsForTest(profile);
+  ProfileSyncService::InitParams init_params;
 
   init_params.signin_wrapper =
       make_scoped_ptr(new SigninManagerWrapper(signin));
   init_params.oauth2_token_service = oauth2_token_service;
   init_params.start_behavior = behavior;
+  init_params.sync_client =

[stanisc, 2016/01/19 19:04:00]

Is this new code a replacement for CreateProfileSyncServiceParamsForTest? What
was the reason for in-lining it?

[vabr (Chromium), 2016/01/20 16:43:41]

I created CreateProfileSyncServiceParamsForTest as a convenience method for
tests using Profile. However, the goal (not achieved in this CL yet) is to
componentise this test, in particular, to get rid of Profile.

Some of the init parameters sourced by CreateProfileSyncServiceParamsForTest
from the Profile have already been replaced before this CL, e.g.
oauth2_token_service, so the inlining removes sourcing them from the Profile.

And while this CL still leaves some init params sourced from Profile, it will
get changed soon in subsequent CLs, step by step.

+      make_scoped_ptr(new browser_sync::ChromeSyncClient(profile));
+  init_params.network_time_update_callback =
+      base::Bind(&EmptyNetworkTimeUpdate);
+  init_params.base_directory = profile->GetPath();
+  init_params.url_request_context = profile->GetRequestContext();
+  init_params.debug_identifier = profile->GetDebugName();
+  init_params.channel = chrome::GetChannel();
+  init_params.db_thread = content::BrowserThread::GetMessageLoopProxyForThread(
+      content::BrowserThread::DB);
+  init_params.file_thread =
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::FILE);
+  init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
 
   return init_params;
 }
 
 }  // namespace
 
 namespace browser_sync {
 
 SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
     Profile* profile,
@@ skipping 140 matching lines @@
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 UserShare* TestProfileSyncService::GetUserShare() const {
   return backend_->GetUserShare();
 }
 
 bool TestProfileSyncService::NeedBackup() const {
   return false;
 }