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

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

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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) 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/macros.h"
5 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/sync/test/integration/passwords_helper.h" 8 #include "chrome/browser/sync/test/integration/passwords_helper.h"
8 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 9 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
10 #include "chrome/browser/sync/test/integration/sync_test.h" 11 #include "chrome/browser/sync/test/integration/sync_test.h"
11 #include "components/password_manager/core/browser/password_manager_test_utils.h " 12 #include "components/password_manager/core/browser/password_manager_test_utils.h "
12 13
13 using passwords_helper::AddLogin; 14 using passwords_helper::AddLogin;
14 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier; 15 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ASSERT_TRUE(SetDecryptionPassphrase(2, kValidPassphrase)); 133 ASSERT_TRUE(SetDecryptionPassphrase(2, kValidPassphrase));
133 ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(2))); 134 ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(2)));
134 135
135 // For some reason, the tests won't pass unless these flags are set. 136 // For some reason, the tests won't pass unless these flags are set.
136 GetSyncService(2)->SetSetupInProgress(false); 137 GetSyncService(2)->SetSetupInProgress(false);
137 GetSyncService(2)->SetSyncSetupCompleted(); 138 GetSyncService(2)->SetSyncSetupCompleted();
138 139
139 ASSERT_TRUE(AwaitProfileContainsSamePasswordFormsAsVerifier(2)); 140 ASSERT_TRUE(AwaitProfileContainsSamePasswordFormsAsVerifier(2));
140 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier()); 141 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
141 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698