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/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
11 #include "base/time.h" | 11 #include "base/time.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/sessions/session_types_test_helper.h" | 13 #include "chrome/browser/sessions/session_types_test_helper.h" |
14 #include "chrome/browser/sync/glue/session_model_associator.h" | 14 #include "chrome/browser/sync/glue/session_model_associator.h" |
15 #include "chrome/browser/sync/profile_sync_service.h" | 15 #include "chrome/browser/sync/profile_sync_service.h" |
16 #include "chrome/browser/sync/profile_sync_service_factory.h" | 16 #include "chrome/browser/sync/profile_sync_service_factory.h" |
17 #include "chrome/browser/sync/profile_sync_service_harness.h" | 17 #include "chrome/browser/sync/profile_sync_service_harness.h" |
18 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 18 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
19 #include "chrome/browser/sync/test/integration/sync_test.h" | 19 #include "chrome/browser/sync/test/integration/sync_test.h" |
20 #include "chrome/browser/ui/singleton_tabs.h" | 20 #include "chrome/browser/ui/singleton_tabs.h" |
21 #include "chrome/test/base/ui_test_utils.h" | 21 #include "chrome/test/base/ui_test_utils.h" |
22 #include "content/public/browser/browser_thread.h" | |
23 #include "googleurl/src/gurl.h" | 22 #include "googleurl/src/gurl.h" |
24 | 23 |
25 using sync_datatype_helper::test; | 24 using sync_datatype_helper::test; |
26 | 25 |
27 namespace sessions_helper { | 26 namespace sessions_helper { |
28 | 27 |
29 ScopedWindowMap::ScopedWindowMap() { | 28 ScopedWindowMap::ScopedWindowMap() { |
30 } | 29 } |
31 | 30 |
32 ScopedWindowMap::ScopedWindowMap(SessionWindowMap* windows) { | 31 ScopedWindowMap::ScopedWindowMap(SessionWindowMap* windows) { |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 return true; | 314 return true; |
316 } | 315 } |
317 | 316 |
318 void DeleteForeignSession(int index, std::string session_tag) { | 317 void DeleteForeignSession(int index, std::string session_tag) { |
319 ProfileSyncServiceFactory::GetInstance()->GetForProfile( | 318 ProfileSyncServiceFactory::GetInstance()->GetForProfile( |
320 test()->GetProfile(index))-> | 319 test()->GetProfile(index))-> |
321 GetSessionModelAssociator()->DeleteForeignSession(session_tag); | 320 GetSessionModelAssociator()->DeleteForeignSession(session_tag); |
322 } | 321 } |
323 | 322 |
324 } // namespace sessions_helper | 323 } // namespace sessions_helper |
OLD | NEW |