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

Side by Side Diff: chrome/test/live_sync/single_client_live_sessions_sync_test.cc

Issue 6462015: Cleanup more test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wtf windows is this me Created 9 years, 10 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) 2010 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/scoped_vector.h" 5 #include "base/scoped_vector.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h"
6 #include "chrome/test/live_sync/live_sessions_sync_test.h" 7 #include "chrome/test/live_sync/live_sessions_sync_test.h"
7 8
8 IN_PROC_BROWSER_TEST_F(SingleClientLiveSessionsSyncTest, Sanity) { 9 IN_PROC_BROWSER_TEST_F(SingleClientLiveSessionsSyncTest, Sanity) {
9 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 10 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
10 11
11 ASSERT_TRUE(CheckInitialState(0)); 12 ASSERT_TRUE(CheckInitialState(0));
12 13
13 std::vector<SessionWindow*>* old_windows = 14 std::vector<SessionWindow*>* old_windows =
14 InitializeNewWindowWithTab(0, GURL("about:bubba")); 15 InitializeNewWindowWithTab(0, GURL("about:bubba"));
15 ASSERT_TRUE(old_windows); 16 ASSERT_TRUE(old_windows);
16 17
17 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( 18 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
18 "Waiting for session change.")); 19 "Waiting for session change."));
19 20
20 // Get foreign session data from client 0. 21 // Get foreign session data from client 0.
21 std::vector<const ForeignSession*> sessions; 22 std::vector<const ForeignSession*> sessions;
22 ASSERT_FALSE(GetSessionData(0, &sessions)); 23 ASSERT_FALSE(GetSessionData(0, &sessions));
23 ASSERT_EQ(0U, sessions.size()); 24 ASSERT_EQ(0U, sessions.size());
24 25
25 // Verify client didn't change. 26 // Verify client didn't change.
26 std::vector<SessionWindow*>* new_windows = GetHelper(0)->ReadWindows(); 27 std::vector<SessionWindow*>* new_windows = GetHelper(0)->ReadWindows();
27 ASSERT_TRUE(new_windows); 28 ASSERT_TRUE(new_windows);
28 ASSERT_TRUE(WindowsMatch(*old_windows, *new_windows)); 29 ASSERT_TRUE(WindowsMatch(*old_windows, *new_windows));
29 } 30 }
30 31
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698