OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | |
10 #include "chrome/browser/sync/test/integration/sync_test.h" | 9 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 10 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" |
11 #include "chrome/browser/sync/test/integration/wifi_credentials_helper.h" | 11 #include "chrome/browser/sync/test/integration/wifi_credentials_helper.h" |
12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
13 #include "components/browser_sync/browser_sync_switches.h" | 13 #include "components/browser_sync/browser_sync_switches.h" |
14 #include "components/wifi_sync/wifi_credential.h" | 14 #include "components/wifi_sync/wifi_credential.h" |
15 #include "components/wifi_sync/wifi_security_class.h" | 15 #include "components/wifi_sync/wifi_security_class.h" |
16 | 16 |
17 using sync_integration_test_util::AwaitCommitActivityCompletion; | |
18 using wifi_sync::WifiCredential; | 17 using wifi_sync::WifiCredential; |
19 | 18 |
20 using WifiCredentialSet = wifi_sync::WifiCredential::CredentialSet; | 19 using WifiCredentialSet = wifi_sync::WifiCredential::CredentialSet; |
21 | 20 |
22 class SingleClientWifiCredentialsSyncTest : public SyncTest { | 21 class SingleClientWifiCredentialsSyncTest : public SyncTest { |
23 public: | 22 public: |
24 SingleClientWifiCredentialsSyncTest() : SyncTest(SINGLE_CLIENT) {} | 23 SingleClientWifiCredentialsSyncTest() : SyncTest(SINGLE_CLIENT) {} |
25 ~SingleClientWifiCredentialsSyncTest() override {} | 24 ~SingleClientWifiCredentialsSyncTest() override {} |
26 | 25 |
27 // SyncTest implementation. | 26 // SyncTest implementation. |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 const size_t profile_index = 0; | 63 const size_t profile_index = 0; |
65 wifi_credentials_helper::AddWifiCredential( | 64 wifi_credentials_helper::AddWifiCredential( |
66 profile_index, "fake_id", *credential); | 65 profile_index, "fake_id", *credential); |
67 | 66 |
68 const WifiCredentialSet verifier_credentials = | 67 const WifiCredentialSet verifier_credentials = |
69 wifi_credentials_helper::GetWifiCredentialsForProfile(verifier()); | 68 wifi_credentials_helper::GetWifiCredentialsForProfile(verifier()); |
70 EXPECT_EQ(1U, verifier_credentials.size()); | 69 EXPECT_EQ(1U, verifier_credentials.size()); |
71 EXPECT_EQ(WifiCredential::MakeSsidBytesForTest(ssid), | 70 EXPECT_EQ(WifiCredential::MakeSsidBytesForTest(ssid), |
72 verifier_credentials.begin()->ssid()); | 71 verifier_credentials.begin()->ssid()); |
73 | 72 |
74 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(profile_index))); | 73 ASSERT_TRUE( |
| 74 UpdatedProgressMarkerChecker(GetSyncService(profile_index)).Wait()); |
75 EXPECT_TRUE(wifi_credentials_helper::ProfileMatchesVerifier(profile_index)); | 75 EXPECT_TRUE(wifi_credentials_helper::ProfileMatchesVerifier(profile_index)); |
76 } | 76 } |
OLD | NEW |