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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/browser/sessions/session_service.h" 11 #include "chrome/browser/sessions/session_service.h"
12 #include "chrome/browser/sync/test/integration/passwords_helper.h" 12 #include "chrome/browser/sync/test/integration/passwords_helper.h"
13 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 13 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
14 #include "chrome/browser/sync/test/integration/sessions_helper.h" 14 #include "chrome/browser/sync/test/integration/sessions_helper.h"
15 #include "chrome/browser/sync/test/integration/sync_test.h" 15 #include "chrome/browser/sync/test/integration/sync_test.h"
16 #include "sync/internal_api/public/sessions/sync_session_snapshot.h" 16 #include "components/sync/sessions/sync_session_snapshot.h"
17 17
18 using passwords_helper::SetDecryptionPassphrase; 18 using passwords_helper::SetDecryptionPassphrase;
19 using passwords_helper::SetEncryptionPassphrase; 19 using passwords_helper::SetEncryptionPassphrase;
20 using sessions_helper::CheckInitialState; 20 using sessions_helper::CheckInitialState;
21 using sessions_helper::DeleteForeignSession; 21 using sessions_helper::DeleteForeignSession;
22 using sessions_helper::GetLocalWindows; 22 using sessions_helper::GetLocalWindows;
23 using sessions_helper::GetSessionData; 23 using sessions_helper::GetSessionData;
24 using sessions_helper::OpenTabAndGetLocalWindows; 24 using sessions_helper::OpenTabAndGetLocalWindows;
25 using sessions_helper::ScopedWindowMap; 25 using sessions_helper::ScopedWindowMap;
26 using sessions_helper::SessionWindowMap; 26 using sessions_helper::SessionWindowMap;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 ASSERT_FALSE(GetSessionData(1, &sessions1)); 232 ASSERT_FALSE(GetSessionData(1, &sessions1));
233 233
234 // Client 0 becomes active again with a new tab. 234 // Client 0 becomes active again with a new tab.
235 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2), 235 ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),
236 client0_windows.GetMutable())); 236 client0_windows.GetMutable()));
237 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 237 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
238 ASSERT_TRUE(GetSessionData(1, &sessions1)); 238 ASSERT_TRUE(GetSessionData(1, &sessions1));
239 ASSERT_EQ(1U, sessions1.size()); 239 ASSERT_EQ(1U, sessions1.size());
240 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get())); 240 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
241 } 241 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698