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

Side by Side Diff: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor CR feedback addressed. Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 5 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/sessions/session_tab_helper.h" 9 #include "chrome/browser/sessions/session_tab_helper.h"
10 #include "chrome/browser/sessions/session_types.h" 10 #include "chrome/browser/sessions/session_types.h"
11 #include "chrome/browser/sync/glue/device_info.h"
12 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" 11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
13 #include "chrome/browser/sync/glue/session_sync_test_helper.h" 12 #include "chrome/browser/sync/glue/session_sync_test_helper.h"
14 #include "chrome/browser/sync/glue/synced_tab_delegate.h" 13 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
15 #include "chrome/browser/sync/glue/synced_window_delegate.h" 14 #include "chrome/browser/sync/glue/synced_window_delegate.h"
16 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 15 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
17 #include "chrome/browser/sync/sessions/sessions_util.h" 16 #include "chrome/browser/sync/sessions/sessions_util.h"
18 #include "chrome/browser/sync/sessions/synced_window_delegates_getter.h" 17 #include "chrome/browser/sync/sessions/synced_window_delegates_getter.h"
19 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" 18 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/test/base/browser_with_test_window_test.h" 20 #include "chrome/test/base/browser_with_test_window_test.h"
22 #include "components/sessions/serialized_navigation_entry_test_helper.h" 21 #include "components/sessions/serialized_navigation_entry_test_helper.h"
23 #include "components/sessions/session_id.h" 22 #include "components/sessions/session_id.h"
23 #include "components/sync_driver/device_info.h"
24 #include "content/public/browser/navigation_entry.h" 24 #include "content/public/browser/navigation_entry.h"
25 #include "content/public/browser/notification_details.h" 25 #include "content/public/browser/notification_details.h"
26 #include "content/public/browser/notification_service.h" 26 #include "content/public/browser/notification_service.h"
27 #include "content/public/browser/notification_source.h" 27 #include "content/public/browser/notification_source.h"
28 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
29 #include "sync/api/attachments/attachment_id.h" 29 #include "sync/api/attachments/attachment_id.h"
30 #include "sync/api/sync_error_factory_mock.h" 30 #include "sync/api/sync_error_factory_mock.h"
31 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h" 31 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
32 #include "testing/gmock/include/gmock/gmock.h" 32 #include "testing/gmock/include/gmock/gmock.h"
33 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
34 34
35 using content::WebContents; 35 using content::WebContents;
36 using sessions::SerializedNavigationEntry; 36 using sessions::SerializedNavigationEntry;
37 using sessions::SerializedNavigationEntryTestHelper; 37 using sessions::SerializedNavigationEntryTestHelper;
38 using sync_driver::DeviceInfo;
39 using sync_driver::LocalDeviceInfoProvider;
38 using syncer::SyncChange; 40 using syncer::SyncChange;
39 using syncer::SyncData; 41 using syncer::SyncData;
40 42
41 namespace browser_sync { 43 namespace browser_sync {
42 44
43 namespace { 45 namespace {
44 46
45 class SyncedWindowDelegateOverride : public SyncedWindowDelegate { 47 class SyncedWindowDelegateOverride : public SyncedWindowDelegate {
46 public: 48 public:
47 explicit SyncedWindowDelegateOverride(SyncedWindowDelegate* wrapped) 49 explicit SyncedWindowDelegateOverride(SyncedWindowDelegate* wrapped)
(...skipping 1950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1998 base::Time(), 2000 base::Time(),
1999 syncer::AttachmentIdList(), 2001 syncer::AttachmentIdList(),
2000 syncer::AttachmentServiceProxyForTest::Create())); 2002 syncer::AttachmentServiceProxyForTest::Create()));
2001 } 2003 }
2002 2004
2003 syncer::SyncChangeList output; 2005 syncer::SyncChangeList output;
2004 InitWithSyncDataTakeOutput(initial_data, &output); 2006 InitWithSyncDataTakeOutput(initial_data, &output);
2005 } 2007 }
2006 2008
2007 } // namespace browser_sync 2009 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698