Only enable password generation if password manager and autofill are both

chrome/renderer/autofill/password_generation_manager_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/renderer/autofill/password_generation_manager.h"
 #include "chrome/test/base/chrome_render_view_test.h"
@@ skipping 95 matching lines @@
   WebInputElement first_password_element = element.to<WebInputElement>();
   EXPECT_EQ(0u, generation_manager_->messages().size());
   element = document.getElementById(WebString::fromUTF8("second_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement second_password_element = element.to<WebInputElement>();
   EXPECT_EQ(0u, generation_manager_->messages().size());
   SetFocused(first_password_element.to<WebNode>());
   EXPECT_EQ(0u, generation_manager_->messages().size());
 
   // Pretend like sync was enabled.
-  AutofillMsg_PasswordSyncEnabled msg(0, true);
+  AutofillMsg_PasswordGenerationEnabled msg(0, true);
   generation_manager_->OnMessageReceived(msg);
 
   // Now we will send a message once the first password feld is focused.
   LoadHTML(kAccountCreationFormHTML);
   document = GetMainFrame()->document();
   element = document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   first_password_element = element.to<WebInputElement>();
   EXPECT_EQ(0u, generation_manager_->messages().size());
   element = document.getElementById(WebString::fromUTF8("second_password"));
   ASSERT_FALSE(element.isNull());
   second_password_element = element.to<WebInputElement>();
   EXPECT_EQ(0u, generation_manager_->messages().size());
   SetFocused(first_password_element.to<WebNode>());
   EXPECT_EQ(1u, generation_manager_->messages().size());
   EXPECT_EQ(AutofillHostMsg_ShowPasswordGenerationPopup::ID,
             generation_manager_->messages()[0]->type());
 }
 
 TEST_F(PasswordGenerationManagerTest, FillTest) {
   // Make sure that we are enabled before loading HTML.
-  AutofillMsg_PasswordSyncEnabled enabled_msg(0, true);
+  AutofillMsg_PasswordGenerationEnabled enabled_msg(0, true);
   generation_manager_->OnMessageReceived(enabled_msg);
   LoadHTML(kAccountCreationFormHTML);
 
   WebDocument document = GetMainFrame()->document();
   WebElement element =
       document.getElementById(WebString::fromUTF8("first_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement first_password_element = element.to<WebInputElement>();
   element = document.getElementById(WebString::fromUTF8("second_password"));
   ASSERT_FALSE(element.isNull());
   WebInputElement second_password_element = element.to<WebInputElement>();
 
   // Both password fields should be empty.
   EXPECT_TRUE(first_password_element.value().isNull());
   EXPECT_TRUE(second_password_element.value().isNull());
 
   string16 password = ASCIIToUTF16("random_password");
   AutofillMsg_GeneratedPasswordAccepted msg(0, password);
   generation_manager_->OnMessageReceived(msg);
 
   // Password fields are filled out and set as being autofilled.
   EXPECT_EQ(password, first_password_element.value());
   EXPECT_EQ(password, second_password_element.value());
   EXPECT_TRUE(first_password_element.isAutofilled());
   EXPECT_TRUE(second_password_element.isAutofilled());
 }
 
 }  // namespace autofill