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

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

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1
Patch Set: Rebase. Created 4 years, 4 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 "components/sync_sessions/sessions_sync_manager.h" 5 #include "components/sync_sessions/sessions_sync_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9
9 #include <utility> 10 #include <utility>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "chrome/browser/sessions/session_tab_helper.h" 15 #include "chrome/browser/sessions/session_tab_helper.h"
15 #include "chrome/browser/sync/chrome_sync_client.h" 16 #include "chrome/browser/sync/chrome_sync_client.h"
16 #include "chrome/browser/sync/glue/session_sync_test_helper.h" 17 #include "chrome/browser/sync/glue/session_sync_test_helper.h"
17 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 18 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
18 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h" 19 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
19 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" 20 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/test/base/browser_with_test_window_test.h" 22 #include "chrome/test/base/browser_with_test_window_test.h"
22 #include "components/sessions/content/content_serialized_navigation_builder.h" 23 #include "components/sessions/content/content_serialized_navigation_builder.h"
23 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" 24 #include "components/sessions/core/serialized_navigation_entry_test_helper.h"
24 #include "components/sessions/core/session_id.h" 25 #include "components/sessions/core/session_id.h"
25 #include "components/sessions/core/session_types.h" 26 #include "components/sessions/core/session_types.h"
27 #include "components/sync/api/attachments/attachment_id.h"
28 #include "components/sync/api/sync_error_factory_mock.h"
29 #include "components/sync/core/attachments/attachment_service_proxy_for_test.h"
26 #include "components/sync_driver/device_info.h" 30 #include "components/sync_driver/device_info.h"
27 #include "components/sync_driver/local_device_info_provider_mock.h" 31 #include "components/sync_driver/local_device_info_provider_mock.h"
28 #include "components/sync_driver/sync_api_component_factory.h" 32 #include "components/sync_driver/sync_api_component_factory.h"
29 #include "components/sync_sessions/sync_sessions_client.h" 33 #include "components/sync_sessions/sync_sessions_client.h"
30 #include "components/sync_sessions/synced_tab_delegate.h" 34 #include "components/sync_sessions/synced_tab_delegate.h"
31 #include "components/sync_sessions/synced_window_delegate.h" 35 #include "components/sync_sessions/synced_window_delegate.h"
32 #include "components/sync_sessions/synced_window_delegates_getter.h" 36 #include "components/sync_sessions/synced_window_delegates_getter.h"
33 #include "content/public/browser/navigation_entry.h" 37 #include "content/public/browser/navigation_entry.h"
34 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
35 #include "sync/api/attachments/attachment_id.h"
36 #include "sync/api/sync_error_factory_mock.h"
37 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
38 #include "testing/gmock/include/gmock/gmock.h" 39 #include "testing/gmock/include/gmock/gmock.h"
39 #include "testing/gtest/include/gtest/gtest.h" 40 #include "testing/gtest/include/gtest/gtest.h"
40 41
41 using content::WebContents; 42 using content::WebContents;
42 using sessions::SerializedNavigationEntry; 43 using sessions::SerializedNavigationEntry;
43 using sessions::SerializedNavigationEntryTestHelper; 44 using sessions::SerializedNavigationEntryTestHelper;
44 using sync_driver::DeviceInfo; 45 using sync_driver::DeviceInfo;
45 using sync_driver::LocalDeviceInfoProvider; 46 using sync_driver::LocalDeviceInfoProvider;
46 using sync_driver::LocalDeviceInfoProviderMock; 47 using sync_driver::LocalDeviceInfoProviderMock;
47 using sync_driver::SyncedSession; 48 using sync_driver::SyncedSession;
(...skipping 2545 matching lines...) Expand 10 before | Expand all | Expand 10 after
2593 base::Time last_time; 2594 base::Time last_time;
2594 for (size_t i = 0; i < tabs.size(); ++i) { 2595 for (size_t i = 0; i < tabs.size(); ++i) {
2595 base::Time this_time = tabs[i]->timestamp; 2596 base::Time this_time = tabs[i]->timestamp;
2596 if (i > 0) 2597 if (i > 0)
2597 ASSERT_GE(last_time, this_time); 2598 ASSERT_GE(last_time, this_time);
2598 last_time = tabs[i]->timestamp; 2599 last_time = tabs[i]->timestamp;
2599 } 2600 }
2600 } 2601 }
2601 2602
2602 } // namespace browser_sync 2603 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698