OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/test/live_sync/live_sessions_sync_test.h" | 5 #include "chrome/test/live_sync/live_sessions_sync_test.h" |
6 | 6 |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "base/time.h" | 8 #include "base/time.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/sync/profile_sync_service.h" | 10 #include "chrome/browser/sync/profile_sync_service.h" |
11 #include "chrome/browser/sync/glue/session_model_associator.h" | 11 #include "chrome/browser/sync/glue/session_model_associator.h" |
12 #include "chrome/test/ui_test_utils.h" | |
13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 12 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" |
14 #include "content/browser/browser_thread.h" | 14 #include "content/browser/browser_thread.h" |
15 #include "content/browser/tab_contents/tab_contents.h" | 15 #include "content/browser/tab_contents/tab_contents.h" |
16 #include "googleurl/src/gurl.h" | 16 #include "googleurl/src/gurl.h" |
17 | 17 |
18 LiveSessionsSyncTest::LiveSessionsSyncTest(TestType test_type) | 18 LiveSessionsSyncTest::LiveSessionsSyncTest(TestType test_type) |
19 : LiveSyncTest(test_type), | 19 : LiveSyncTest(test_type), |
20 done_closing_(false, false) {} | 20 done_closing_(false, false) {} |
21 | 21 |
22 LiveSessionsSyncTest::~LiveSessionsSyncTest() {} | 22 LiveSessionsSyncTest::~LiveSessionsSyncTest() {} |
23 | 23 |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 // sync profile. | 287 // sync profile. |
288 BrowserList::CloseAllBrowsers(); | 288 BrowserList::CloseAllBrowsers(); |
289 ui_test_utils::RunAllPendingInMessageLoop(); | 289 ui_test_utils::RunAllPendingInMessageLoop(); |
290 | 290 |
291 // All browsers should be closed at this point, else when the framework | 291 // All browsers should be closed at this point, else when the framework |
292 // calls QuitBrowsers() we could see memory corruption. | 292 // calls QuitBrowsers() we could see memory corruption. |
293 ASSERT_EQ(0U, BrowserList::size()); | 293 ASSERT_EQ(0U, BrowserList::size()); |
294 | 294 |
295 LiveSyncTest::CleanUpOnMainThread(); | 295 LiveSyncTest::CleanUpOnMainThread(); |
296 } | 296 } |
OLD | NEW |