| 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/passwords_helper.h" | 8 #include "chrome/browser/sync/test/integration/passwords_helper.h" |
| 10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 11 #include "chrome/browser/sync/test/integration/sessions_helper.h" | 10 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
| 12 #include "chrome/browser/sync/test/integration/sync_test.h" | 11 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 13 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" | 12 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" |
| 14 | 13 |
| 15 using passwords_helper::SetDecryptionPassphrase; | 14 using passwords_helper::SetDecryptionPassphrase; |
| 16 using passwords_helper::SetEncryptionPassphrase; | 15 using passwords_helper::SetEncryptionPassphrase; |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 ASSERT_FALSE(GetSessionData(1, &sessions1)); | 205 ASSERT_FALSE(GetSessionData(1, &sessions1)); |
| 207 | 206 |
| 208 // Client 0 becomes active again with a new tab. | 207 // Client 0 becomes active again with a new tab. |
| 209 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2), | 208 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2), |
| 210 client0_windows.GetMutable())); | 209 client0_windows.GetMutable())); |
| 211 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 210 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 212 ASSERT_TRUE(GetSessionData(1, &sessions1)); | 211 ASSERT_TRUE(GetSessionData(1, &sessions1)); |
| 213 ASSERT_EQ(1U, sessions1.size()); | 212 ASSERT_EQ(1U, sessions1.size()); |
| 214 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get())); | 213 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get())); |
| 215 } | 214 } |
| OLD | NEW |