OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test/integration/sessions_helper.h" | 5 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/location.h" | 11 #include "base/location.h" |
12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
15 #include "base/test/test_timeouts.h" | 15 #include "base/test/test_timeouts.h" |
16 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/sync/profile_sync_service.h" | |
20 #include "chrome/browser/sync/profile_sync_service_factory.h" | 19 #include "chrome/browser/sync/profile_sync_service_factory.h" |
21 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" | 20 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" |
22 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke
r.h" | 21 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke
r.h" |
23 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 22 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
24 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 23 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
25 #include "chrome/browser/sync/test/integration/sync_test.h" | 24 #include "chrome/browser/sync/test/integration/sync_test.h" |
26 #include "chrome/browser/ui/singleton_tabs.h" | 25 #include "chrome/browser/ui/singleton_tabs.h" |
27 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
| 27 #include "components/browser_sync/browser/profile_sync_service.h" |
28 #include "components/sync_driver/open_tabs_ui_delegate.h" | 28 #include "components/sync_driver/open_tabs_ui_delegate.h" |
29 #include "components/sync_driver/sync_client.h" | 29 #include "components/sync_driver/sync_client.h" |
30 #include "content/public/test/test_utils.h" | 30 #include "content/public/test/test_utils.h" |
31 #include "url/gurl.h" | 31 #include "url/gurl.h" |
32 | 32 |
33 using sync_datatype_helper::test; | 33 using sync_datatype_helper::test; |
34 | 34 |
35 namespace sessions_helper { | 35 namespace sessions_helper { |
36 | 36 |
37 ScopedWindowMap::ScopedWindowMap() { | 37 ScopedWindowMap::ScopedWindowMap() { |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
430 return !checker.TimedOut(); | 430 return !checker.TimedOut(); |
431 } | 431 } |
432 | 432 |
433 void DeleteForeignSession(int index, std::string session_tag) { | 433 void DeleteForeignSession(int index, std::string session_tag) { |
434 ProfileSyncServiceFactory::GetInstance()->GetForProfile( | 434 ProfileSyncServiceFactory::GetInstance()->GetForProfile( |
435 test()->GetProfile(index))-> | 435 test()->GetProfile(index))-> |
436 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); | 436 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); |
437 } | 437 } |
438 | 438 |
439 } // namespace sessions_helper | 439 } // namespace sessions_helper |
OLD | NEW |