Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/memory/scoped_vector.h" 5 #include "base/memory/scoped_vector.h"
6 #include "base/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "chrome/browser/sessions/session_service.h" 7 #include "chrome/browser/sessions/session_service.h"
8 #include "chrome/browser/sync/profile_sync_service_harness.h" 8 #include "chrome/browser/sync/profile_sync_service_harness.h"
9 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" 9 #include "chrome/browser/sync/test/integration/sync_test.h"
10 #include "chrome/browser/sync/test/live_sync/sessions_helper.h" 10 #include "chrome/browser/sync/test/integration/sessions_helper.h"
11 11
12 using sessions_helper::CheckForeignSessionsAgainst; 12 using sessions_helper::CheckForeignSessionsAgainst;
13 using sessions_helper::CheckInitialState; 13 using sessions_helper::CheckInitialState;
14 using sessions_helper::OpenTabAndGetLocalWindows; 14 using sessions_helper::OpenTabAndGetLocalWindows;
15 15
16 class MultipleClientSessionsSyncTest : public LiveSyncTest { 16 class MultipleClientSessionsSyncTest : public SyncTest {
17 public: 17 public:
18 MultipleClientSessionsSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {} 18 MultipleClientSessionsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
19 virtual ~MultipleClientSessionsSyncTest() {} 19 virtual ~MultipleClientSessionsSyncTest() {}
20 20
21 private: 21 private:
22 DISALLOW_COPY_AND_ASSIGN(MultipleClientSessionsSyncTest); 22 DISALLOW_COPY_AND_ASSIGN(MultipleClientSessionsSyncTest);
23 }; 23 };
24 24
25 IN_PROC_BROWSER_TEST_F(MultipleClientSessionsSyncTest, AllChanged) { 25 IN_PROC_BROWSER_TEST_F(MultipleClientSessionsSyncTest, AllChanged) {
26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
27 ScopedVector<SessionWindowVector> client_windows; 27 ScopedVector<SessionWindowVector> client_windows;
28 28
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Wait for sync. 77 // Wait for sync.
78 ASSERT_TRUE(AwaitQuiescence()); 78 ASSERT_TRUE(AwaitQuiescence());
79 79
80 // Get foreign session data from all clients and check it against all 80 // Get foreign session data from all clients and check it against all
81 // client_windows. 81 // client_windows.
82 for (int i = 0; i < num_clients(); ++i) { 82 for (int i = 0; i < num_clients(); ++i) {
83 ASSERT_TRUE(IsEncrypted(i, syncable::SESSIONS)); 83 ASSERT_TRUE(IsEncrypted(i, syncable::SESSIONS));
84 ASSERT_TRUE(CheckForeignSessionsAgainst(i, client_windows.get())); 84 ASSERT_TRUE(CheckForeignSessionsAgainst(i, client_windows.get()));
85 } 85 }
86 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698