| 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 "base/guid.h" | 5 #include "base/guid.h" |
| 6 #include "base/memory/scoped_vector.h" | |
| 7 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 8 #include "chrome/browser/sessions/session_service.h" | 7 #include "chrome/browser/sessions/session_service.h" |
| 9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 10 #include "chrome/browser/sync/test/integration/sessions_helper.h" | 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
| 11 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 12 | 11 |
| 13 using sessions_helper::AwaitCheckForeignSessionsAgainst; | 12 using sessions_helper::AwaitCheckForeignSessionsAgainst; |
| 14 using sessions_helper::CheckInitialState; | 13 using sessions_helper::CheckInitialState; |
| 15 using sessions_helper::OpenTabAndGetLocalWindows; | 14 using sessions_helper::OpenTabAndGetLocalWindows; |
| 16 using sessions_helper::ScopedWindowMap; | 15 using sessions_helper::ScopedWindowMap; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 client_windows[i].Reset(&windows); | 81 client_windows[i].Reset(&windows); |
| 83 } | 82 } |
| 84 | 83 |
| 85 // Get foreign session data from all clients and check it against all | 84 // Get foreign session data from all clients and check it against all |
| 86 // client_windows. | 85 // client_windows. |
| 87 for (int i = 0; i < num_clients(); ++i) { | 86 for (int i = 0; i < num_clients(); ++i) { |
| 88 ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(i, client_windows)); | 87 ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(i, client_windows)); |
| 89 ASSERT_TRUE(IsEncryptionComplete(i)); | 88 ASSERT_TRUE(IsEncryptionComplete(i)); |
| 90 } | 89 } |
| 91 } | 90 } |
| OLD | NEW |