Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Unified Diff: components/browser_sync/profile_sync_service_typed_url_unittest.cc

Issue 2612323003: [Sync] Filter out types that can't be synced at configure time. (Closed)
Patch Set: Fix bots. Created 3 years, 11 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
Index: components/browser_sync/profile_sync_service_typed_url_unittest.cc
diff --git a/components/browser_sync/profile_sync_service_typed_url_unittest.cc b/components/browser_sync/profile_sync_service_typed_url_unittest.cc
index da6c619b817cc37ef0839c5b8ce35ada11bdabbb..440cd85be7eee83edb3310033148a48d25027ea7 100644
--- a/components/browser_sync/profile_sync_service_typed_url_unittest.cc
+++ b/components/browser_sync/profile_sync_service_typed_url_unittest.cc
@@ -60,8 +60,9 @@ const char kDummySavingBrowserHistoryDisabled[] = "dummyPref";
// Visits with this timestamp are treated as expired.
static const int EXPIRED_VISIT = -1;
-ACTION(ReturnNewDataTypeManager) {
- return new syncer::DataTypeManagerImpl(arg0, arg1, arg2, arg3, arg4, arg5);
+ACTION_P(ReturnNewDataTypeManager, sync_client) {
+ return new syncer::DataTypeManagerImpl(sync_client, arg0, arg1, arg2, arg3,
+ arg4, arg5);
}
class HistoryBackendMock : public HistoryBackend {
@@ -247,10 +248,10 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {
SigninManagerBase* signin =
profile_sync_service_bundle()->signin_manager();
signin->SetAuthenticatedAccountInfo("gaia_id", "test");
- CreateSyncService(std::move(sync_client_), callback);
EXPECT_CALL(*profile_sync_service_bundle()->component_factory(),
CreateDataTypeManager(_, _, _, _, _, _))
- .WillOnce(ReturnNewDataTypeManager());
+ .WillOnce(ReturnNewDataTypeManager(sync_client_.get()));
+ CreateSyncService(std::move(sync_client_), callback);
profile_sync_service_bundle()->auth_service()->UpdateCredentials(
account_id, "oauth2_login_token");
« no previous file with comments | « components/browser_sync/profile_sync_service_autofill_unittest.cc ('k') | components/sync/driver/data_type_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698