| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
| (...skipping 2912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2923 profile()->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false); | 2923 profile()->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false); |
| 2924 // Always set password generation enabled check box so we can test the | 2924 // Always set password generation enabled check box so we can test the |
| 2925 // behavior of password sync. | 2925 // behavior of password sync. |
| 2926 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true); | 2926 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true); |
| 2927 | 2927 |
| 2928 // Sync some things, but not passwords. Shouldn't send anything since | 2928 // Sync some things, but not passwords. Shouldn't send anything since |
| 2929 // password generation is disabled by default. | 2929 // password generation is disabled by default. |
| 2930 ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile( | 2930 ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile( |
| 2931 profile()); | 2931 profile()); |
| 2932 sync_service->SetSyncSetupCompleted(); | 2932 sync_service->SetSyncSetupCompleted(); |
| 2933 syncable::ModelTypeSet preferred_set; | 2933 syncer::ModelTypeSet preferred_set; |
| 2934 preferred_set.Put(syncable::EXTENSIONS); | 2934 preferred_set.Put(syncer::EXTENSIONS); |
| 2935 preferred_set.Put(syncable::PREFERENCES); | 2935 preferred_set.Put(syncer::PREFERENCES); |
| 2936 sync_service->ChangePreferredDataTypes(preferred_set); | 2936 sync_service->ChangePreferredDataTypes(preferred_set); |
| 2937 syncable::ModelTypeSet new_set = sync_service->GetPreferredDataTypes(); | 2937 syncer::ModelTypeSet new_set = sync_service->GetPreferredDataTypes(); |
| 2938 UpdatePasswordGenerationState(false); | 2938 UpdatePasswordGenerationState(false); |
| 2939 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); | 2939 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); |
| 2940 | 2940 |
| 2941 // Now sync passwords. | 2941 // Now sync passwords. |
| 2942 preferred_set.Put(syncable::PASSWORDS); | 2942 preferred_set.Put(syncer::PASSWORDS); |
| 2943 sync_service->ChangePreferredDataTypes(preferred_set); | 2943 sync_service->ChangePreferredDataTypes(preferred_set); |
| 2944 UpdatePasswordGenerationState(false); | 2944 UpdatePasswordGenerationState(false); |
| 2945 EXPECT_EQ(1u, autofill_manager_->GetSentStates().size()); | 2945 EXPECT_EQ(1u, autofill_manager_->GetSentStates().size()); |
| 2946 EXPECT_TRUE(autofill_manager_->GetSentStates()[0]); | 2946 EXPECT_TRUE(autofill_manager_->GetSentStates()[0]); |
| 2947 autofill_manager_->ClearSentStates(); | 2947 autofill_manager_->ClearSentStates(); |
| 2948 | 2948 |
| 2949 // Add some additional synced state. Nothing should be sent. | 2949 // Add some additional synced state. Nothing should be sent. |
| 2950 preferred_set.Put(syncable::THEMES); | 2950 preferred_set.Put(syncer::THEMES); |
| 2951 sync_service->ChangePreferredDataTypes(preferred_set); | 2951 sync_service->ChangePreferredDataTypes(preferred_set); |
| 2952 UpdatePasswordGenerationState(false); | 2952 UpdatePasswordGenerationState(false); |
| 2953 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); | 2953 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); |
| 2954 | 2954 |
| 2955 // Disable syncing. This should disable the feature. | 2955 // Disable syncing. This should disable the feature. |
| 2956 sync_service->DisableForUser(); | 2956 sync_service->DisableForUser(); |
| 2957 UpdatePasswordGenerationState(false); | 2957 UpdatePasswordGenerationState(false); |
| 2958 EXPECT_EQ(1u, autofill_manager_->GetSentStates().size()); | 2958 EXPECT_EQ(1u, autofill_manager_->GetSentStates().size()); |
| 2959 EXPECT_FALSE(autofill_manager_->GetSentStates()[0]); | 2959 EXPECT_FALSE(autofill_manager_->GetSentStates()[0]); |
| 2960 autofill_manager_->ClearSentStates(); | 2960 autofill_manager_->ClearSentStates(); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 2974 autofill_manager_->ClearSentStates(); | 2974 autofill_manager_->ClearSentStates(); |
| 2975 } | 2975 } |
| 2976 | 2976 |
| 2977 TEST_F(AutofillManagerTest, UpdatePasswordGenerationState) { | 2977 TEST_F(AutofillManagerTest, UpdatePasswordGenerationState) { |
| 2978 // Always set password sync enabled so we can test the behavior of password | 2978 // Always set password sync enabled so we can test the behavior of password |
| 2979 // generation. | 2979 // generation. |
| 2980 profile()->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false); | 2980 profile()->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false); |
| 2981 ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile( | 2981 ProfileSyncService* sync_service = ProfileSyncServiceFactory::GetForProfile( |
| 2982 profile()); | 2982 profile()); |
| 2983 sync_service->SetSyncSetupCompleted(); | 2983 sync_service->SetSyncSetupCompleted(); |
| 2984 syncable::ModelTypeSet preferred_set; | 2984 syncer::ModelTypeSet preferred_set; |
| 2985 preferred_set.Put(syncable::PASSWORDS); | 2985 preferred_set.Put(syncer::PASSWORDS); |
| 2986 sync_service->ChangePreferredDataTypes(preferred_set); | 2986 sync_service->ChangePreferredDataTypes(preferred_set); |
| 2987 | 2987 |
| 2988 // Enabled state remains false, should not sent. | 2988 // Enabled state remains false, should not sent. |
| 2989 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, false); | 2989 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, false); |
| 2990 UpdatePasswordGenerationState(false); | 2990 UpdatePasswordGenerationState(false); |
| 2991 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); | 2991 EXPECT_EQ(0u, autofill_manager_->GetSentStates().size()); |
| 2992 | 2992 |
| 2993 // Enabled state from false to true, should sent true. | 2993 // Enabled state from false to true, should sent true. |
| 2994 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true); | 2994 profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true); |
| 2995 UpdatePasswordGenerationState(false); | 2995 UpdatePasswordGenerationState(false); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3128 | 3128 |
| 3129 AutofillManager* autofill_manager = tab_contents()->autofill_manager(); | 3129 AutofillManager* autofill_manager = tab_contents()->autofill_manager(); |
| 3130 EXPECT_TRUE(autofill_manager->external_delegate()); | 3130 EXPECT_TRUE(autofill_manager->external_delegate()); |
| 3131 | 3131 |
| 3132 AutocompleteHistoryManager* autocomplete_history_manager = | 3132 AutocompleteHistoryManager* autocomplete_history_manager = |
| 3133 tab_contents()->autocomplete_history_manager(); | 3133 tab_contents()->autocomplete_history_manager(); |
| 3134 EXPECT_TRUE(autocomplete_history_manager->external_delegate()); | 3134 EXPECT_TRUE(autocomplete_history_manager->external_delegate()); |
| 3135 } | 3135 } |
| 3136 | 3136 |
| 3137 #endif // OS_ANDROID | 3137 #endif // OS_ANDROID |
| OLD | NEW |