chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc - Issue 1410013008: [Sync] Remove some http-related chrome deps from SyncBackendHostImpl.

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

Issue 1410013008: [Sync] Remove some http-related chrome deps from SyncBackendHostImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Try fixing mac bots. Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/BUILD.gn ('K') | « chrome/browser/sync/glue/sync_backend_host_mock.cc ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | chrome/browser/sync/profile_sync_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

index df46117f16c8c5d7561a07039026bd55a61e54bc..e13edb0942144d0f54c7f5dfab6d4f9ef5a37c45 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/sync/profile_sync_components_factory_impl.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

+#include "chrome/browser/sync/profile_sync_test_util.h"

#include "chrome/common/channel_info.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/testing_profile.h"

@@ -118,10 +119,10 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {

token_service, profile_->GetRequestContext()));

scoped_ptr<sync_driver::SyncClient> sync_client(

new browser_sync::ChromeSyncClient(profile_.get(), factory.Pass()));

- scoped_ptr<ProfileSyncService> pss(

- new ProfileSyncService(sync_client.Pass(), profile_.get(),

- make_scoped_ptr<SigninManagerWrapper>(NULL),

- token_service, browser_sync::MANUAL_START));

+ scoped_ptr<ProfileSyncService> pss(new ProfileSyncService(

+ sync_client.Pass(), profile_.get(),

+ make_scoped_ptr<SigninManagerWrapper>(NULL), token_service,

+ browser_sync::MANUAL_START, base::Bind(&EmptyNetworkTimeUpdate)));

pss->GetSyncClient()->Initialize(pss.get());

DataTypeController::StateMap controller_states;

pss->GetDataTypeControllerStates(&controller_states);

@@ -145,10 +146,10 @@ TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {