| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 8 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 9 #include "chrome/browser/sync/test/integration/wifi_credentials_helper.h" | 9 #include "chrome/browser/sync/test/integration/wifi_credentials_helper.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 IN_PROC_BROWSER_TEST_F(TwoClientWifiCredentialsSyncTest, SingleCredential) { | 51 IN_PROC_BROWSER_TEST_F(TwoClientWifiCredentialsSyncTest, SingleCredential) { |
| 52 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 52 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 53 | 53 |
| 54 const char ssid[] = "fake-ssid"; | 54 const char ssid[] = "fake-ssid"; |
| 55 scoped_ptr<WifiCredential> credential = | 55 scoped_ptr<WifiCredential> credential = |
| 56 wifi_credentials_helper::MakeWifiCredential( | 56 wifi_credentials_helper::MakeWifiCredential( |
| 57 ssid, wifi_sync::SECURITY_CLASS_PSK, "fake_passphrase"); | 57 ssid, wifi_sync::SECURITY_CLASS_PSK, "fake_passphrase"); |
| 58 ASSERT_TRUE(credential); | 58 ASSERT_TRUE(credential); |
| 59 | 59 |
| 60 const size_t profile_a_index = 0; | 60 const size_t profile_a_index = 0; |
| 61 wifi_credentials_helper::AddWifiCredential( | 61 wifi_credentials_helper::AddWifiCredential(profile_a_index, *credential); |
| 62 profile_a_index, "fake_id", *credential); | |
| 63 | 62 |
| 64 const WifiCredentialSet verifier_credentials = | 63 const WifiCredentialSet verifier_credentials = |
| 65 wifi_credentials_helper::GetWifiCredentialsForProfile(verifier()); | 64 wifi_credentials_helper::GetWifiCredentialsForProfile(verifier()); |
| 66 EXPECT_EQ(1U, verifier_credentials.size()); | 65 EXPECT_EQ(1U, verifier_credentials.size()); |
| 67 EXPECT_EQ(WifiCredential::MakeSsidBytesForTest(ssid), | 66 EXPECT_EQ(WifiCredential::MakeSsidBytesForTest(ssid), |
| 68 verifier_credentials.begin()->ssid()); | 67 verifier_credentials.begin()->ssid()); |
| 69 | 68 |
| 70 const size_t profile_b_index = 1; | 69 const size_t profile_b_index = 1; |
| 71 ASSERT_TRUE(GetClient(profile_a_index)->AwaitMutualSyncCycleCompletion( | 70 ASSERT_TRUE(GetClient(profile_a_index)->AwaitMutualSyncCycleCompletion( |
| 72 GetClient(profile_b_index))); | 71 GetClient(profile_b_index))); |
| 73 EXPECT_FALSE(wifi_credentials_helper::VerifierIsEmpty()); | 72 EXPECT_FALSE(wifi_credentials_helper::VerifierIsEmpty()); |
| 74 EXPECT_TRUE(wifi_credentials_helper::AllProfilesMatch()); | 73 EXPECT_TRUE(wifi_credentials_helper::AllProfilesMatch()); |
| 75 } | 74 } |
| OLD | NEW |