Chromium Code Reviews| Index: chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc |
| diff --git a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc |
| index f8c68aa85ee5442ed0fc8d3004451227ee119b84..27e50b37858791ddb7915804b56543071e7e9e15 100644 |
| --- a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc |
| +++ b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc |
| @@ -4,19 +4,34 @@ |
| #include "base/command_line.h" |
| #include "base/macros.h" |
| +#include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
| #include "chrome/browser/sync/test/integration/sync_test.h" |
| #include "chrome/browser/sync/test/integration/wifi_credentials_helper.h" |
| #include "chrome/common/chrome_switches.h" |
| +#include "components/wifi_sync/wifi_credential.h" |
| +#include "components/wifi_sync/wifi_security_class.h" |
| + |
| +using sync_integration_test_util::AwaitCommitActivityCompletion; |
| +using wifi_sync::WifiCredential; |
| class SingleClientWifiCredentialsSyncTest : public SyncTest { |
| public: |
| SingleClientWifiCredentialsSyncTest() : SyncTest(SINGLE_CLIENT) {} |
| ~SingleClientWifiCredentialsSyncTest() override {} |
| + // SyncTest implementation. |
| + void SetUp() override { |
| + wifi_credentials_helper::SetUp(); |
| + SyncTest::SetUp(); |
| + } |
|
stevenjb
2015/01/28 23:02:50
nit: There should still be WS between method imple
mukesh agrawal
2015/01/30 22:28:14
Done.
|
| void SetUpCommandLine(base::CommandLine* command_line) override { |
| SyncTest::SetUpCommandLine(command_line); |
| command_line->AppendSwitch(switches::kEnableWifiCredentialSync); |
| } |
| + bool SetupClients() override { |
| + return SyncTest::SetupClients() && |
| + wifi_credentials_helper::SetupClients(); |
| + } |
| private: |
| DISALLOW_COPY_AND_ASSIGN(SingleClientWifiCredentialsSyncTest); |
| @@ -27,3 +42,19 @@ IN_PROC_BROWSER_TEST_F(SingleClientWifiCredentialsSyncTest, NoCredentials) { |
| ASSERT_TRUE(wifi_credentials_helper::VerifierIsEmpty()); |
| ASSERT_TRUE(wifi_credentials_helper::ProfileMatchesVerifier(0)); |
| } |
| + |
| +IN_PROC_BROWSER_TEST_F(SingleClientWifiCredentialsSyncTest, SingleCredential) { |
| + ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| + |
| + scoped_ptr<WifiCredential> credential = |
| + wifi_credentials_helper::MakeWifiCredential( |
| + "fake-ssid", wifi_sync::SECURITY_CLASS_PSK, "fake_passphrase"); |
| + ASSERT_TRUE(credential); |
| + |
| + const size_t profile_index = 0; |
| + wifi_credentials_helper::AddWifiCredential( |
| + profile_index, "fake_id", *credential); |
| + ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
| + EXPECT_FALSE(wifi_credentials_helper::VerifierIsEmpty()); |
| + EXPECT_TRUE(wifi_credentials_helper::ProfileMatchesVerifier(0)); |
| +} |