| 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/memory/scoped_vector.h" | 5 #include "base/memory/scoped_vector.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "chrome/browser/sessions/session_service.h" | 7 #include "chrome/browser/sessions/session_service.h" |
| 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" | 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
| 10 #include "chrome/browser/sync/test/integration/sync_test.h" | 10 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 11 | 11 |
| 12 using sessions_helper::AwaitCheckForeignSessionsAgainst; | 12 using sessions_helper::AwaitCheckForeignSessionsAgainst; |
| 13 using sessions_helper::CheckInitialState; | 13 using sessions_helper::CheckInitialState; |
| 14 using sessions_helper::OpenTabAndGetLocalWindows; | 14 using sessions_helper::OpenTabAndGetLocalWindows; |
| 15 using sessions_helper::ScopedWindowMap; | 15 using sessions_helper::ScopedWindowMap; |
| 16 using sessions_helper::SessionWindowMap; | 16 using sessions_helper::SessionWindowMap; |
| 17 using sessions_helper::SyncedSessionVector; | 17 using sessions_helper::SyncedSessionVector; |
| 18 | 18 |
| 19 class MultipleClientSessionsSyncTest : public SyncTest { | 19 class MultipleClientSessionsSyncTest : public SyncTest { |
| 20 public: | 20 public: |
| 21 MultipleClientSessionsSyncTest() : SyncTest(MULTIPLE_CLIENT) {} | 21 MultipleClientSessionsSyncTest() : SyncTest(MULTIPLE_CLIENT) {} |
| 22 virtual ~MultipleClientSessionsSyncTest() {} | 22 ~MultipleClientSessionsSyncTest() override {} |
| 23 | 23 |
| 24 private: | 24 private: |
| 25 DISALLOW_COPY_AND_ASSIGN(MultipleClientSessionsSyncTest); | 25 DISALLOW_COPY_AND_ASSIGN(MultipleClientSessionsSyncTest); |
| 26 }; | 26 }; |
| 27 | 27 |
| 28 // Timeout on Windows, see http://crbug.com/99819 | 28 // Timeout on Windows, see http://crbug.com/99819 |
| 29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
| 30 #define MAYBE_AllChanged DISABLED_AllChanged | 30 #define MAYBE_AllChanged DISABLED_AllChanged |
| 31 #define MAYBE_EncryptedAndChanged DISABLED_EncryptedAndChanged | 31 #define MAYBE_EncryptedAndChanged DISABLED_EncryptedAndChanged |
| 32 #else | 32 #else |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 client_windows[i].Reset(&windows); | 83 client_windows[i].Reset(&windows); |
| 84 } | 84 } |
| 85 | 85 |
| 86 // Get foreign session data from all clients and check it against all | 86 // Get foreign session data from all clients and check it against all |
| 87 // client_windows. | 87 // client_windows. |
| 88 for (int i = 0; i < num_clients(); ++i) { | 88 for (int i = 0; i < num_clients(); ++i) { |
| 89 ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(i, client_windows)); | 89 ASSERT_TRUE(AwaitCheckForeignSessionsAgainst(i, client_windows)); |
| 90 ASSERT_TRUE(IsEncryptionComplete(i)); | 90 ASSERT_TRUE(IsEncryptionComplete(i)); |
| 91 } | 91 } |
| 92 } | 92 } |
| OLD | NEW |