Remove --respect-autocomplete-off-autofill flag.

components/autofill/core/browser/autofill_manager_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 516 matching lines @@
   explicit TestAutofillExternalDelegate(AutofillManager* autofill_manager,
                                         AutofillDriver* autofill_driver)
       : AutofillExternalDelegate(autofill_manager, autofill_driver),
         on_query_seen_(false),
         on_suggestions_returned_seen_(false) {}
   ~TestAutofillExternalDelegate() override {}
 
   void OnQuery(int query_id,
                const FormData& form,
                const FormFieldData& field,
-               const gfx::RectF& bounds,
-               bool display_warning) override {
+               const gfx::RectF& bounds) override {
     on_query_seen_ = true;
     on_suggestions_returned_seen_ = false;
   }
 
   void OnSuggestionsReturned(
       int query_id,
       const std::vector<Suggestion>& suggestions) override {
     on_suggestions_returned_seen_ = true;
     query_id_ = query_id;
     suggestions_ = suggestions;
@@ skipping 96 matching lines @@
 
     // Remove the AutofillWebDataService so TestPersonalDataManager does not
     // need to care about removing self as an observer in destruction.
     personal_data_.set_database(scoped_refptr<AutofillWebDataService>(NULL));
     personal_data_.SetPrefService(NULL);
   }
 
   void GetAutofillSuggestions(int query_id,
                               const FormData& form,
                               const FormFieldData& field) {
-    autofill_manager_->OnQueryFormFieldAutofill(query_id,
-                                                form,
-                                                field,
-                                                gfx::Rect(),
-                                                false);
+    autofill_manager_->OnQueryFormFieldAutofill(query_id, form, field,
+                                                gfx::Rect());
   }
 
   void GetAutofillSuggestions(const FormData& form,
                               const FormFieldData& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
   void AutocompleteSuggestionsReturned(
       const std::vector<base::string16>& result) {
     autofill_manager_->autocomplete_history_manager_->SendSuggestions(&result);
@@ skipping 1771 matching lines @@
   suggestions.push_back(ASCIIToUTF16("Jay"));
   suggestions.push_back(ASCIIToUTF16("Jason"));
   AutocompleteSuggestionsReturned(suggestions);
 
   external_delegate_->CheckSuggestions(
       kDefaultPageID,
       Suggestion("Jay", "", "", 0),
       Suggestion("Jason", "", "", 0));
 }
 
-// Duplicate of the below test with the respect-autocomplete-off-autofill
-// switch.
-TEST_F(AutofillManagerTest, AutocompleteOffRespected) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kRespectAutocompleteOffForAutofill);
-
+TEST_F(AutofillManagerTest, AutocompleteOffRespectedForAutocomplete) {
   TestAutofillClient client;
   autofill_manager_.reset(
       new TestAutofillManager(autofill_driver_.get(), &client, NULL));
-  autofill_manager_->set_autofill_enabled(false);
-  autofill_manager_->SetExternalDelegate(external_delegate_.get());
-
-  scoped_ptr<MockAutocompleteHistoryManager> autocomplete_history_manager;
-  autocomplete_history_manager.reset(
-      new MockAutocompleteHistoryManager(autofill_driver_.get(), &client));
-  autofill_manager_->autocomplete_history_manager_ =
-      autocomplete_history_manager.Pass();
-  MockAutocompleteHistoryManager* m = static_cast<
-      MockAutocompleteHistoryManager*>(
-          autofill_manager_->autocomplete_history_manager_.get());
-  EXPECT_CALL(*m,
-      OnGetAutocompleteSuggestions(_, _, _, _, _)).Times(0);
-
-  // Set up our form data.
-  FormData form;
-  test::CreateTestAddressFormData(&form);
-  std::vector<FormData> forms(1, form);
-  FormsSeen(forms);
-  FormFieldData* field = &form.fields[0];
-  field->should_autocomplete = false;
-  GetAutofillSuggestions(form, *field);
-}
-
-TEST_F(AutofillManagerTest, AutocompleteOffRespectedWithFlag) {
-  TestAutofillClient client;
-  autofill_manager_.reset(
-      new TestAutofillManager(autofill_driver_.get(), &client, NULL));
   autofill_manager_->set_autofill_enabled(false);
   autofill_manager_->SetExternalDelegate(external_delegate_.get());
 
   scoped_ptr<MockAutocompleteHistoryManager> autocomplete_history_manager;
   autocomplete_history_manager.reset(
       new MockAutocompleteHistoryManager(autofill_driver_.get(), &client));
   autofill_manager_->autocomplete_history_manager_ =
       autocomplete_history_manager.Pass();
   MockAutocompleteHistoryManager* m = static_cast<
       MockAutocompleteHistoryManager*>(
@@ skipping 672 matching lines @@
 
   external_delegate_->CheckSuggestions(
       kDefaultPageID,
       Suggestion(
           "Visa\xC2\xA0\xE2\x8B\xAF"
           "3456",
           "04/12", kVisaCard, autofill_manager_->GetPackedCreditCardID(4)));
 }
 
 }  // namespace autofill