chrome/browser/extensions/api/sessions/sessions_apitest.cc - Issue 74653002: sync: Add --enable-sync-sessions-v2 and necessary plumbing to use SessionsSyncManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 74653002: sync: Add --enable-sync-sessions-v2 and necessary plumbing to use SessionsSyncManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 7 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 | « chrome/browser/extensions/api/sessions/sessions_api.cc ('k') | chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc » ('j') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 4643a4c6c07def6a0c7d766b18ce41b5f51337c0..92326af1429848938a930cb3f13e17a20314bfff 100644

--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc

+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/extensions/extension_function_test_utils.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/sync/glue/session_model_associator.h"

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

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

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

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

@@ -119,7 +120,7 @@ void ExtensionSessionsTest::CreateTestProfileSyncService() {

preferred_types.Put(syncer::SESSIONS);

GoogleServiceAuthError no_error(GoogleServiceAuthError::NONE);

- ON_CALL(*service, GetSessionModelAssociator()).WillByDefault(

+ ON_CALL(*service, GetOpenTabsUIDelegate()).WillByDefault(

testing::Return(associator_));

ON_CALL(*service, GetPreferredDataTypes()).WillByDefault(

testing::Return(preferred_types));