Revert 66214 - Display a warning when autofill is disabled for a website....

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/string16.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/ipc_test_sink.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
 using webkit_glue::FormData;
 
 typedef Tuple5<int,
                std::vector<string16>,
                std::vector<string16>,
                std::vector<string16>,
@@ skipping 16 matching lines @@
        if (!(*it)->Label().compare(ASCIIToUTF16(label)))
          return *it;
     }
     return NULL;
   }
 
   void AddProfile(AutoFillProfile* profile) {
     web_profiles_->push_back(profile);
   }
 
-  void ClearAutoFillProfiles() {
-    web_profiles_.reset();
-  }
-
-  void ClearCreditCards() {
-    credit_cards_.reset();
-  }
-
  private:
   void CreateTestAutoFillProfiles(ScopedVector<AutoFillProfile>* profiles) {
     AutoFillProfile* profile = new AutoFillProfile;
     autofill_test::SetProfileInfo(profile, "Home", "Elvis", "Aaron",
                                   "Presley", "theking@gmail.com", "RCA",
                                   "3734 Elvis Presley Blvd.", "Apt. 10",
                                   "Memphis", "Tennessee", "38116", "USA",
                                   "12345678901", "");
     profile->set_guid("00000000-0000-0000-0000-000000000001");
     profiles->push_back(profile);
@@ skipping 31 matching lines @@
     credit_cards->push_back(credit_card);
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestPersonalDataManager);
 };
 
 class TestAutoFillManager : public AutoFillManager {
  public:
   TestAutoFillManager(TabContents* tab_contents,
                       TestPersonalDataManager* personal_manager)
-      : AutoFillManager(tab_contents, NULL),
-        autofill_enabled_(true) {
+      : AutoFillManager(tab_contents, NULL) {
     test_personal_data_ = personal_manager;
     set_personal_data_manager(personal_manager);
     // Download manager requests are disabled for purposes of this unit-test.
     // These request are tested in autofill_download_unittest.cc.
     set_disable_download_manager_requests(true);
   }
 
-  virtual bool IsAutoFillEnabled() const { return autofill_enabled_; }
-
-  void set_autofill_enabled(bool autofill_enabled) {
-    autofill_enabled_ = autofill_enabled;
-  }
+  virtual bool IsAutoFillEnabled() const { return true; }
 
   AutoFillProfile* GetLabeledProfile(const char* label) {
     return test_personal_data_->GetLabeledProfile(label);
   }
 
   void AddProfile(AutoFillProfile* profile) {
     test_personal_data_->AddProfile(profile);
   }
 
  private:
   TestPersonalDataManager* test_personal_data_;
-  bool autofill_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutoFillManager);
 };
 
 // Populates |form| with data corresponding to a simple address form.
 // Note that this actually appends fields to the form data, which can be useful
 // for building up more complex test forms.
 void CreateTestAddressFormData(FormData* form) {
   form->name = ASCIIToUTF16("MyForm");
   form->method = ASCIIToUTF16("POST");
@@ skipping 143 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
@@ skipping 20 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "E", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(1U, values.size());
@@ skipping 31 matching lines @@
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   autofill_test::CreateTestFormField(
       "Username", "username", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
   EXPECT_FALSE(
-      autofill_manager_->GetAutoFillSuggestions(false, field));
-}
-
-// Test that we return no suggestions when autofill is disabled.
-TEST_F(AutoFillManagerTest, GetProfileSuggestionsAutofillDisabledByUser) {
-  FormData form;
-  CreateTestAddressFormData(&form);
-
-  // Set up our FormStructures.
-  std::vector<FormData> forms;
-  forms.push_back(form);
-  autofill_manager_->FormsSeen(forms);
-
-  // Disable AutoFill.
-  autofill_manager_->set_autofill_enabled(false);
-
-  // The page ID sent to the AutoFillManager from the RenderView, used to send
-  // an IPC message back to the renderer.
-  const int kPageID = 1;
-
-  webkit_glue::FormField field;
-  autofill_test::CreateTestFormField(
-      "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(false, field));
-}
-
-// Test that we return a warning explaining that autofill suggestions are
-// unavailable when the form method is GET rather than POST.
-TEST_F(AutoFillManagerTest, GetProfileSuggestionsMethodGet) {
-  FormData form;
-  CreateTestAddressFormData(&form);
-  form.method = ASCIIToUTF16("GET");
-
-  // Set up our FormStructures.
-  std::vector<FormData> forms;
-  forms.push_back(form);
-  autofill_manager_->FormsSeen(forms);
-
-  // The page ID sent to the AutoFillManager from the RenderView, used to send
-  // an IPC message back to the renderer.
-  const int kPageID = 1;
-
-  webkit_glue::FormField field;
-  autofill_test::CreateTestFormField(
-      "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
-
-  // No suggestions provided, so send an empty vector as the results.
-  // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
-
-  // Test that we sent the right message to the renderer.
-  int page_id = 0;
-  std::vector<string16> values;
-  std::vector<string16> labels;
-  std::vector<string16> icons;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
-                                            &icons));
-  EXPECT_EQ(kPageID, page_id);
-  ASSERT_EQ(1U, values.size());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED),
-            values[0]);
-  ASSERT_EQ(1U, labels.size());
-  EXPECT_EQ(string16(), labels[0]);
-  ASSERT_EQ(1U, icons.size());
-  EXPECT_EQ(string16(), icons[0]);
-
-  // Now add some Autocomplete suggestions. We should return the autocomplete
-  // suggestions and the warning; these will be culled by the renderer.
-  process()->sink().ClearMessages();
-  const int kPageID2 = 2;
-  rvh()->ResetAutoFillState(kPageID2);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
-
-  std::vector<string16> suggestions;
-  suggestions.push_back(ASCIIToUTF16("Jay"));
-  suggestions.push_back(ASCIIToUTF16("Jason"));
-  rvh()->AutocompleteSuggestionsReturned(suggestions);
-
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
-                                            &icons));
-  EXPECT_EQ(kPageID2, page_id);
-  ASSERT_EQ(3U, values.size());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED),
-            values[0]);
-  EXPECT_EQ(ASCIIToUTF16("Jay"), values[1]);
-  EXPECT_EQ(ASCIIToUTF16("Jason"), values[2]);
-  ASSERT_EQ(3U, labels.size());
-  EXPECT_EQ(string16(), labels[0]);
-  EXPECT_EQ(string16(), labels[1]);
-  EXPECT_EQ(string16(), labels[2]);
-  ASSERT_EQ(3U, icons.size());
-  EXPECT_EQ(string16(), icons[0]);
-  EXPECT_EQ(string16(), icons[1]);
-  EXPECT_EQ(string16(), icons[2]);
-
-  // Now clear the test profiles and try again -- we shouldn't return a warning.
-  test_personal_data_->ClearAutoFillProfiles();
-  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(false, field));
+      autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 }
 
 // Test that we return all credit card profile suggestions when all form fields
 // are empty.
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) {
   FormData form;
   CreateTestCreditCardFormData(&form, true);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
@@ skipping 18 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "4", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(1U, values.size());
@@ skipping 15 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "Name on Card", "nameoncard", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[1]);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("*3456"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("*8765"), labels[1]);
   ASSERT_EQ(2U, icons.size());
   EXPECT_EQ(ASCIIToUTF16("visaCC"), icons[0]);
   EXPECT_EQ(ASCIIToUTF16("masterCardCC"), icons[1]);
 }
 
-// Test that we return a warning explaining that credit card profile suggestions
-// are unavailable when the form is not https.
+// Test that we return no credit card profile suggestions when the form is not
+// https.
 TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
   FormData form;
   CreateTestCreditCardFormData(&form, false);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
-
-  // No suggestions provided, so send an empty vector as the results.
-  // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
-
-  // Test that we sent the right message to the renderer.
-  int page_id = 0;
-  std::vector<string16> values;
-  std::vector<string16> labels;
-  std::vector<string16> icons;
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
-                                            &icons));
-  EXPECT_EQ(kPageID, page_id);
-  ASSERT_EQ(1U, values.size());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_INSECURE_CONNECTION),
-            values[0]);
-  ASSERT_EQ(1U, labels.size());
-  EXPECT_EQ(string16(), labels[0]);
-  ASSERT_EQ(1U, icons.size());
-  EXPECT_EQ(string16(), icons[0]);
-
-  // Now add some Autocomplete suggestions. We should show the autocomplete
-  // suggestions and the warning.
-  process()->sink().ClearMessages();
-  const int kPageID2 = 2;
-  rvh()->ResetAutoFillState(kPageID2);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
-
-  std::vector<string16> suggestions;
-  suggestions.push_back(ASCIIToUTF16("Jay"));
-  suggestions.push_back(ASCIIToUTF16("Jason"));
-  rvh()->AutocompleteSuggestionsReturned(suggestions);
-
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
-                                            &icons));
-  EXPECT_EQ(kPageID2, page_id);
-  ASSERT_EQ(3U, values.size());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_INSECURE_CONNECTION),
-            values[0]);
-  EXPECT_EQ(ASCIIToUTF16("Jay"), values[1]);
-  EXPECT_EQ(ASCIIToUTF16("Jason"), values[2]);
-  ASSERT_EQ(3U, labels.size());
-  EXPECT_EQ(string16(), labels[0]);
-  EXPECT_EQ(string16(), labels[1]);
-  EXPECT_EQ(string16(), labels[2]);
-  ASSERT_EQ(3U, icons.size());
-  EXPECT_EQ(string16(), icons[0]);
-  EXPECT_EQ(string16(), icons[1]);
-  EXPECT_EQ(string16(), icons[2]);
-
-  // Clear the test credit cards and try again -- we shouldn't return a warning.
-  test_personal_data_->ClearCreditCards();
-  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_FALSE(
+      autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 }
 
 // Test that we return profile and credit card suggestions for combined forms.
 TEST_F(AutoFillManagerTest, GetAddressAndCreditCardSuggestions) {
   FormData form;
   CreateTestAddressFormData(&form);
   CreateTestCreditCardFormData(&form, true);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right address suggestions to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]);
   ASSERT_EQ(2U, labels.size());
   // Inferred labels now include full first relevant field, which in this case
   // the address #1.
   EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("123 Apple St."), labels[1]);
   ASSERT_EQ(2U, icons.size());
   EXPECT_EQ(string16(), icons[0]);
   EXPECT_EQ(string16(), icons[1]);
 
   process()->sink().ClearMessages();
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the credit card suggestions to the renderer.
   page_id = 0;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[1]);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(ASCIIToUTF16("*3456"), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("*8765"), labels[1]);
   ASSERT_EQ(2U, icons.size());
   EXPECT_EQ(ASCIIToUTF16("visaCC"), icons[0]);
   EXPECT_EQ(ASCIIToUTF16("masterCardCC"), icons[1]);
 }
 
 // Test that for non-https forms with both address and credit card fields, we
-// only return address suggestions. Instead of credit card suggestions, we
-// should return a warning explaining that credit card profile suggestions are
-// unavailable when the form is not https.
+// only return address suggestions.
 TEST_F(AutoFillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
   FormData form;
   CreateTestAddressFormData(&form);
   CreateTestCreditCardFormData(&form, false);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right address suggestions to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]);
   ASSERT_EQ(2U, labels.size());
   // Inferred labels now include full first relevant field, which in this case
   // the address #1.
   EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), labels[0]);
   EXPECT_EQ(ASCIIToUTF16("123 Apple St."), labels[1]);
   ASSERT_EQ(2U, icons.size());
   EXPECT_EQ(string16(), icons[0]);
   EXPECT_EQ(string16(), icons[1]);
 
-  process()->sink().ClearMessages();
   autofill_test::CreateTestFormField(
       "Card Number", "cardnumber", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
-
-  // No suggestions provided, so send an empty vector as the results.
-  // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
-
-  // Test that we sent the right message to the renderer.
-  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
-                                            &icons));
-  EXPECT_EQ(kPageID, page_id);
-  ASSERT_EQ(1U, values.size());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_INSECURE_CONNECTION),
-            values[0]);
-  ASSERT_EQ(1U, labels.size());
-  EXPECT_EQ(string16(), labels[0]);
-  ASSERT_EQ(1U, icons.size());
-  EXPECT_EQ(string16(), icons[0]);
-
-  // Clear the test credit cards and try again -- we shouldn't return a warning.
-  test_personal_data_->ClearCreditCards();
-  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_FALSE(
+      autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 }
 
 // Test that we correctly combine autofill and autocomplete suggestions.
 TEST_F(AutoFillManagerTest, GetCombinedAutoFillAndAutocompleteSuggestions) {
   FormData form;
   CreateTestAddressFormData(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(false, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
 
   // Add some Autocomplete suggestions.
   // This triggers the combined message send.
   std::vector<string16> suggestions;
   suggestions.push_back(ASCIIToUTF16("Jay"));
   suggestions.push_back(ASCIIToUTF16("Jason"));
-  rvh()->AutocompleteSuggestionsReturned(suggestions);
+  rvh()->AutocompleteSuggestionsReturned(kPageID, suggestions);
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(4U, values.size());
@@ skipping 24 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(true, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, true, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
@@ skipping 18 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "Some Field", "somefield", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(true, field));
+  EXPECT_FALSE(autofill_manager_->GetAutoFillSuggestions(kPageID, true, field));
 
   // Add some Autocomplete suggestions.
   // This triggers the combined message send.
   std::vector<string16> suggestions;
   suggestions.push_back(ASCIIToUTF16("one"));
   suggestions.push_back(ASCIIToUTF16("two"));
-  rvh()->AutocompleteSuggestionsReturned(suggestions);
+  rvh()->AutocompleteSuggestionsReturned(kPageID, suggestions);
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
@@ skipping 24 matching lines @@
                                 "", "", "", "", "", "", "", "");
   autofill_manager_->AddProfile(profile);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
 
   webkit_glue::FormField field;
   autofill_test::CreateTestFormField(
       "First Name", "firstname", "", "text", &field);
-  rvh()->ResetAutoFillState(kPageID);
-  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(true, field));
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, true, field));
 
   // No suggestions provided, so send an empty vector as the results.
   // This triggers the combined message send.
-  rvh()->AutocompleteSuggestionsReturned(std::vector<string16>());
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
 
   // Test that we sent the right message to the renderer.
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   std::vector<string16> icons;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels,
                                             &icons));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
@@ skipping 525 matching lines @@
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, true);
   profile()->GetPrefs()->ClearPref(prefs::kAutoFillAuxiliaryProfilesEnabled);
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 #endif
 }