Make password generation switched by a preference in chrome settings rather than a command line fla…

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 470 matching lines @@
       MessageLoop::current()->Run();
     } else {
       did_finish_async_form_submit_ = false;
     }
   }
 
   virtual void UploadFormData(const FormStructure& submitted_form) OVERRIDE {
     submitted_form_signature_ = submitted_form.FormSignature();
   }
 
+  virtual void SendPasswordSyncStateToRenderer(

[Garrett Casto, 2012/04/26 23:23:59]

Remove this.

+      content::RenderViewHost* host, bool enabled) OVERRIDE {
+    sent_sync_states_.push_back(enabled);
+  }
+
   virtual void SendPasswordGenerationStateToRenderer(
       content::RenderViewHost* host, bool enabled) OVERRIDE {
-    sent_states_.push_back(enabled);
+    sent_enabled_states_.push_back(enabled);
   }
 
-  const std::vector<bool>& GetSentStates() {
-    return sent_states_;
+  const std::vector<bool>& GetSentSyncStates() {
+    return sent_sync_states_;
   }
 
-  void ClearSentStates() {
-    sent_states_.clear();
+  const std::vector<bool>& GetSentEnabledStates() {
+    return sent_enabled_states_;
+  }
+
+  void ClearSentSyncStates() {
+    sent_sync_states_.clear();
+  }
+
+  void ClearSentEnabledStates() {
+    sent_enabled_states_.clear();
   }
 
   const std::string GetSubmittedFormSignature() {
     return submitted_form_signature_;
   }
 
   AutofillProfile* GetProfileWithGUID(const char* guid) {
     return personal_data_->GetProfileWithGUID(guid);
   }
 
@@ skipping 23 matching lines @@
   // Weak reference.
   TestPersonalDataManager* personal_data_;
 
   bool autofill_enabled_;
 
   bool did_finish_async_form_submit_;
   bool message_loop_is_running_;
 
   std::string submitted_form_signature_;
   std::vector<FieldTypeSet> expected_submitted_field_types_;
-  std::vector<bool> sent_states_;
+  std::vector<bool> sent_sync_states_;
+  std::vector<bool> sent_enabled_states_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillManager);
 };
 
 }  // namespace
 
 class AutofillManagerTest : public TabContentsWrapperTestHarness {
  public:
   typedef AutofillManager::GUIDPair GUIDPair;
 
@@ skipping 20 matching lines @@
                                                 &personal_data_);
 
     file_thread_.Start();
   }
 
   virtual void TearDown() OVERRIDE {
     file_thread_.Stop();
     TabContentsWrapperTestHarness::TearDown();
   }
 
+  void UpdatePasswordSyncState(bool new_renderer) {
+    autofill_manager_->UpdatePasswordSyncState(NULL, new_renderer);
+  }
+
   void UpdatePasswordGenerationState(bool new_renderer) {
     autofill_manager_->UpdatePasswordGenerationState(NULL, new_renderer);
   }
 
   void GetAutofillSuggestions(int query_id,
                               const webkit::forms::FormData& form,
                               const webkit::forms::FormField& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
@@ skipping 2288 matching lines @@
   autofill_test::CreateTestFormField("", "20", "901", "text", &field);
   types.clear();
   types.insert(UNKNOWN_TYPE);
   form.fields.push_back(field);
   expected_types.push_back(types);
 
   autofill_manager_->set_expected_submitted_field_types(expected_types);
   FormSubmitted(form);
 }
 
-TEST_F(AutofillManagerTest, UpdatePasswordGenerationState) {
+TEST_F(AutofillManagerTest, UpdatePasswordSyncState) {
   // Allow this test to control what should get synced.
   profile()->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false);
 
   // Sync some things, but not passwords. Shouldn't send anything since
   // password generation is disabled by default.
   ProfileSyncService* sync_service = GetProfileSyncService();
   sync_service->SetSyncSetupCompleted();
   syncable::ModelTypeSet preferred_set;
   preferred_set.Put(syncable::EXTENSIONS);
   preferred_set.Put(syncable::PREFERENCES);
   sync_service->ChangePreferredDataTypes(preferred_set);
   syncable::ModelTypeSet new_set = sync_service->GetPreferredDataTypes();
-  UpdatePasswordGenerationState(false);
-  EXPECT_EQ(0u, autofill_manager_->GetSentStates().size());
+  UpdatePasswordSyncState(false);
+  EXPECT_EQ(0u, autofill_manager_->GetSentSyncStates().size());
 
   // Now sync passwords.
   preferred_set.Put(syncable::PASSWORDS);
   sync_service->ChangePreferredDataTypes(preferred_set);
-  UpdatePasswordGenerationState(false);
-  EXPECT_EQ(1u, autofill_manager_->GetSentStates().size());
-  EXPECT_TRUE(autofill_manager_->GetSentStates()[0]);
-  autofill_manager_->ClearSentStates();
+  UpdatePasswordSyncState(false);
+  EXPECT_EQ(1u, autofill_manager_->GetSentSyncStates().size());
+  EXPECT_TRUE(autofill_manager_->GetSentSyncStates()[0]);
+  autofill_manager_->ClearSentSyncStates();
 
   // Add some additional synced state. Nothing should be sent.
   preferred_set.Put(syncable::THEMES);
   sync_service->ChangePreferredDataTypes(preferred_set);
-  UpdatePasswordGenerationState(false);
-  EXPECT_EQ(0u, autofill_manager_->GetSentStates().size());
+  UpdatePasswordSyncState(false);
+  EXPECT_EQ(0u, autofill_manager_->GetSentSyncStates().size());
 
   // Disable syncing. This should disable the feature.
   sync_service->DisableForUser();
-  UpdatePasswordGenerationState(false);
-  EXPECT_EQ(1u, autofill_manager_->GetSentStates().size());
-  EXPECT_FALSE(autofill_manager_->GetSentStates()[0]);
-  autofill_manager_->ClearSentStates();
+  UpdatePasswordSyncState(false);
+  EXPECT_EQ(1u, autofill_manager_->GetSentSyncStates().size());
+  EXPECT_FALSE(autofill_manager_->GetSentSyncStates()[0]);
+  autofill_manager_->ClearSentSyncStates();
 
   // Disable password manager by going incognito, and re-enable syncing. The
   // feature should still be disabled, and nothing will be sent.
   sync_service->SetSyncSetupCompleted();
   profile()->set_incognito(true);
+  UpdatePasswordSyncState(false);
+  EXPECT_EQ(0u, autofill_manager_->GetSentSyncStates().size());
+
+  // When a new render_view is created, we send the state even if it's the
+  // same.
+  UpdatePasswordSyncState(true);
+  EXPECT_EQ(1u, autofill_manager_->GetSentSyncStates().size());
+  EXPECT_FALSE(autofill_manager_->GetSentSyncStates()[0]);
+  autofill_manager_->ClearSentSyncStates();
+}
+
+TEST_F(AutofillManagerTest, UpdatePasswordGenerationState) {
+  // Enabled state remains false, should not sent.
+  profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, false);
   UpdatePasswordGenerationState(false);
-  EXPECT_EQ(0u, autofill_manager_->GetSentStates().size());
+  EXPECT_EQ(0u, autofill_manager_->GetSentEnabledStates().size());
+
+  // Enabled state from false to true, should sent true.
+  profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true);
+  UpdatePasswordGenerationState(false);
+  EXPECT_EQ(1u, autofill_manager_->GetSentEnabledStates().size());
+  EXPECT_TRUE(autofill_manager_->GetSentEnabledStates()[0]);
+  autofill_manager_->ClearSentEnabledStates();
+
+  // Enabled states remains true, should not sent.
+  profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, true);
+  UpdatePasswordGenerationState(false);
+  EXPECT_EQ(0u, autofill_manager_->GetSentEnabledStates().size());
+
+  // Enabled states from true to false, should sent false.
+  profile()->GetPrefs()->SetBoolean(prefs::kPasswordGenerationEnabled, false);
+  UpdatePasswordGenerationState(false);
+  EXPECT_EQ(1u, autofill_manager_->GetSentEnabledStates().size());
+  EXPECT_FALSE(autofill_manager_->GetSentEnabledStates()[0]);
+  autofill_manager_->ClearSentEnabledStates();
 
   // When a new render_view is created, we send the state even if it's the
   // same.
   UpdatePasswordGenerationState(true);
-  EXPECT_EQ(1u, autofill_manager_->GetSentStates().size());
-  EXPECT_FALSE(autofill_manager_->GetSentStates()[0]);
-  autofill_manager_->ClearSentStates();
+  EXPECT_EQ(1u, autofill_manager_->GetSentEnabledStates().size());
+  EXPECT_FALSE(autofill_manager_->GetSentEnabledStates()[0]);
+  autofill_manager_->ClearSentEnabledStates();
 }
-
 namespace {
 
 class MockAutofillExternalDelegate : public TestAutofillExternalDelegate {
  public:
   explicit MockAutofillExternalDelegate(TabContentsWrapper* wrapper,
                                         AutofillManager* autofill_manager)
       : TestAutofillExternalDelegate(wrapper, autofill_manager) {}
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnQuery, void(int query_id,
@@ skipping 47 matching lines @@
 
   AutofillManager* autofill_manager = contents_wrapper()->autofill_manager();
   EXPECT_TRUE(autofill_manager->external_delegate());
 
   AutocompleteHistoryManager* autocomplete_history_manager =
       contents_wrapper()->autocomplete_history_manager();
   EXPECT_TRUE(autocomplete_history_manager->external_delegate());
 }
 
 #endif  // OS_ANDROID