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

Side by Side Diff: chrome/browser/sync/test/integration/multiple_client_passwords_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/stringprintf.h" 5 #include "base/stringprintf.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/password_manager/password_form_data.h" 7 #include "chrome/browser/password_manager/password_form_data.h"
8 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/browser/sync/test/live_sync/passwords_helper.h" 9 #include "chrome/browser/sync/test/integration/passwords_helper.h"
10 10
11 using passwords_helper::AddLogin; 11 using passwords_helper::AddLogin;
12 using passwords_helper::AllProfilesContainSamePasswordForms; 12 using passwords_helper::AllProfilesContainSamePasswordForms;
13 using passwords_helper::CreateTestPasswordForm; 13 using passwords_helper::CreateTestPasswordForm;
14 using passwords_helper::GetPasswordCount; 14 using passwords_helper::GetPasswordCount;
15 using passwords_helper::GetPasswordStore; 15 using passwords_helper::GetPasswordStore;
16 16
17 using webkit_glue::PasswordForm; 17 using webkit_glue::PasswordForm;
18 18
19 class MultipleClientPasswordsSyncTest : public LiveSyncTest { 19 class MultipleClientPasswordsSyncTest : public SyncTest {
20 public: 20 public:
21 MultipleClientPasswordsSyncTest() : LiveSyncTest(MULTIPLE_CLIENT) {} 21 MultipleClientPasswordsSyncTest() : SyncTest(MULTIPLE_CLIENT) {}
22 virtual ~MultipleClientPasswordsSyncTest() {} 22 virtual ~MultipleClientPasswordsSyncTest() {}
23 23
24 private: 24 private:
25 DISALLOW_COPY_AND_ASSIGN(MultipleClientPasswordsSyncTest); 25 DISALLOW_COPY_AND_ASSIGN(MultipleClientPasswordsSyncTest);
26 }; 26 };
27 27
28 // TODO(rsimha): Enable after crbug.com/77993 is fixed. 28 // TODO(rsimha): Enable after crbug.com/77993 is fixed.
29 IN_PROC_BROWSER_TEST_F(MultipleClientPasswordsSyncTest, DISABLED_Sanity) { 29 IN_PROC_BROWSER_TEST_F(MultipleClientPasswordsSyncTest, DISABLED_Sanity) {
30 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 30 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
31 31
32 for (int i = 0; i < num_clients(); ++i) { 32 for (int i = 0; i < num_clients(); ++i) {
33 PasswordForm form = CreateTestPasswordForm(i); 33 PasswordForm form = CreateTestPasswordForm(i);
34 AddLogin(GetPasswordStore(i), form); 34 AddLogin(GetPasswordStore(i), form);
35 } 35 }
36 ASSERT_TRUE(AwaitQuiescence()); 36 ASSERT_TRUE(AwaitQuiescence());
37 37
38 ASSERT_EQ(num_clients(), GetPasswordCount(0)); 38 ASSERT_EQ(num_clients(), GetPasswordCount(0));
39 ASSERT_TRUE(AllProfilesContainSamePasswordForms()); 39 ASSERT_TRUE(AllProfilesContainSamePasswordForms());
40 } 40 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698