chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc - Issue 612103005: Device info datatype should be moved to components/sync_driver.

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/sync/sessions/sessions_sync_manager_unittest.cc

Issue 612103005: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« no previous file with comments | « chrome/browser/sync/sessions/session_data_type_controller_unittest.cc ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

index cbac3981bd1a682fe7216c84abd870bb8fdfde1d..c96a704ad2b4a7ce71d1e82d8ef0dd736dd4fdc8 100644

--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

@@ -8,7 +8,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/sessions/session_tab_helper.h"

#include "chrome/browser/sessions/session_types.h"

-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"

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

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

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

@@ -21,6 +20,7 @@

#include "components/sessions/serialized_navigation_entry_test_helper.h"

#include "components/sessions/session_id.h"

#include "components/sync_driver/device_info.h"

+#include "components/sync_driver/local_device_info_provider_mock.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

@@ -37,6 +37,7 @@ using sessions::SerializedNavigationEntry;

using sessions::SerializedNavigationEntryTestHelper;

using sync_driver::DeviceInfo;

using sync_driver::LocalDeviceInfoProvider;

+using sync_driver::LocalDeviceInfoProviderMock;

using syncer::SyncChange;

using syncer::SyncData;