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

Unified Diff: chrome/browser/extensions/api/sessions/sessions_apitest.cc

Issue 2504433002: [Sync] Return nullptr for OpenTabsUIDelegate when PROXY_TABS is disabled. (Closed)
Patch Set: Gave test case an appropriate name. Created 4 years, 1 month 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
« no previous file with comments | « no previous file | components/browser_sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/sessions/sessions_apitest.cc
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index 906ea81386860675ee202bf03ac5a2335bba7da4..9abe2efa2d991a9ef631740997c0bd017f49b3a6 100644
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -217,11 +217,12 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile, &ExtensionSessionsTest::BuildProfileSyncService));
- syncer::ModelTypeSet preferred_types;
- preferred_types.Put(syncer::SESSIONS);
+ syncer::ModelTypeSet preferred_types(syncer::SESSIONS, syncer::PROXY_TABS);
GoogleServiceAuthError no_error(GoogleServiceAuthError::NONE);
ON_CALL(*service, IsDataTypeControllerRunning(syncer::SESSIONS))
.WillByDefault(testing::Return(true));
+ ON_CALL(*service, IsDataTypeControllerRunning(syncer::PROXY_TABS))
+ .WillByDefault(testing::Return(true));
ON_CALL(*service, GetRegisteredDataTypes())
.WillByDefault(testing::Return(syncer::UserTypes()));
ON_CALL(*service, GetPreferredDataTypes()).WillByDefault(
« no previous file with comments | « no previous file | components/browser_sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698