Chromium part of the autofill refactor: removing now unused code....

chrome/renderer/password_autocomplete_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 "app/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/renderer/password_autocomplete_manager.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 134 matching lines @@
   string16 password2_;
   PasswordFormFillData fill_data_;
 
   WebInputElement username_element_;
   WebInputElement password_element_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PasswordAutocompleteManagerTest);
 };
 
-#if defined(WEBKIT_BUG_41283_IS_FIXED)
-#define MAYBE_InitialAutocomplete InitialAutocomplete
-#define MAYBE_NoInitialAutocompleteForReadOnly NoInitialAutocompleteForReadOnly
-#define MAYBE_PasswordClearOnEdit PasswordClearOnEdit
-#define MAYBE_WaitUsername WaitUsername
-#define MAYBE_InlineAutocomplete InlineAutocomplete
-#define MAYBE_SuggestionSelect SuggestionSelect
-#else
-#define MAYBE_InitialAutocomplete DISABLED_InitialAutocomplete
-#define MAYBE_NoInitialAutocompleteForReadOnly \
-    DISABLED_NoInitialAutocompleteForReadOnly
-#define MAYBE_PasswordClearOnEdit DISABLED_PasswordClearOnEdit
-#define MAYBE_WaitUsername DISABLED_WaitUsername
-#define MAYBE_InlineAutocomplete DISABLED_InlineAutocomplete
-#define MAYBE_SuggestionSelect DISABLED_SuggestionSelect
-#endif
-
 // Tests that the password login is autocompleted as expected when the browser
 // sends back the password info.
-TEST_F(PasswordAutocompleteManagerTest, MAYBE_InitialAutocomplete) {
+TEST_F(PasswordAutocompleteManagerTest, InitialAutocomplete) {
   /*
    * Right now we are not sending the message to the browser because we are
    * loading a data URL and the security origin canAccessPasswordManager()
    * returns false.  May be we should mock URL loading to cirmcuvent this?
    TODO(jcivelli): find a way to make the security origin not deny access to the
                    password manager and then reenable this code.
 
   // The form has been loaded, we should have sent the browser a message about
   // the form.
   const IPC::Message* msg = render_thread_.sink().GetFirstMessageMatching(
@@ skipping 11 matching lines @@
 
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // The username and password should have been autocompleted.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
 // Tests that changing the username does not fill a read-only password field.
-TEST_F(PasswordAutocompleteManagerTest,
-       MAYBE_NoInitialAutocompleteForReadOnly) {
+TEST_F(PasswordAutocompleteManagerTest, NoInitialAutocompleteForReadOnly) {
   password_element_.setAttribute(WebString::fromUTF8("readonly"),
                                  WebString::fromUTF8("true"));
 
   // Simulate the browser sending back the login info, it triggers the
   // autocompleted.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Only the username should have been autocompleted.
   // TODO(jcivelli): may be we should not event fill the username?
   CheckTextFieldsState(kAliceUsername, true, "", false);
 }
 
 // Tests that editing the password clears the autocompleted password field.
-TEST_F(PasswordAutocompleteManagerTest, MAYBE_PasswordClearOnEdit) {
+TEST_F(PasswordAutocompleteManagerTest, PasswordClearOnEdit) {
   // Simulate the browser sending back the login info, it triggers the
   // autocomplete.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Simulate the user changing the username to some unknown username.
   SimulateUsernameChange("alicia", true);
 
   // The password should have been cleared.
   CheckTextFieldsState("alicia", false, "", false);
 }
 
 // Tests that we only autocomplete on focus lost and with a full username match
 // when |wait_for_username| is true.
-TEST_F(PasswordAutocompleteManagerTest, MAYBE_WaitUsername) {
+TEST_F(PasswordAutocompleteManagerTest, WaitUsername) {
   // Simulate the browser sending back the login info.
   fill_data_.wait_for_username = true;
   SimulateOnFillPasswordForm(fill_data_);
 
   // No auto-fill should have taken place.
   CheckTextFieldsState("", false, "", false);
 
   // No autocomplete should happen when text is entered in the username.
   SimulateUsernameChange("a", true);
   CheckTextFieldsState("a", false, "", false);
@@ skipping 12 matching lines @@
   CheckTextFieldsState("al", false, "", false);
   username_element_.setValue("alices");
   view_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState("alices", false, "", false);
   username_element_.setValue(ASCIIToUTF16(kAliceUsername));
   view_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
 // Tests that inline autocompletion works properly.
-TEST_F(PasswordAutocompleteManagerTest, MAYBE_InlineAutocomplete) {
+TEST_F(PasswordAutocompleteManagerTest, InlineAutocomplete) {
   // Simulate the browser sending back the login info.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Clear the textfields to start fresh.
   ClearUsernameAndPasswordFields();
 
   // Simulate the user typing in the first letter of 'alice', a stored username.
   SimulateUsernameChange("a", true);
   // Both the username and password textfields should reflect selection of the
   // stored login.
@@ skipping 25 matching lines @@
   CheckUsernameSelection(3, 3);  // No selection.
 
   // Ok, so now the user removes all the text and enters the letter 'b'.
   SimulateUsernameChange("b", true);
   // The username and password fields should match the 'bob' entry.
   CheckTextFieldsState(kBobUsername, true, kBobPassword, true);
   CheckUsernameSelection(1, 3);
 }
 
 // Tests that selecting and item in the suggestion drop-down works.
-TEST_F(PasswordAutocompleteManagerTest, MAYBE_SuggestionSelect) {
+TEST_F(PasswordAutocompleteManagerTest, SuggestionSelect) {
   // Simulate the browser sending back the login info.
   SimulateOnFillPasswordForm(fill_data_);
 
   // Clear the textfields to start fresh.
   ClearUsernameAndPasswordFields();
 
   // To simulate a selection in the suggestion drop-down we just mimick what the
   // WebView does: it sets the element value then calls
   // didAcceptAutocompleteSuggestion on the renderer.
   username_element_.setValue(ASCIIToUTF16(kAliceUsername));
   view_->didAcceptAutocompleteSuggestion(username_element_);
 
   // Autocomplete should have kicked in.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
 }  // namespace