Create autofill subdirectory in chrome/renderer

chrome/renderer/autofill/password_autofill_manager_unittest.cc

 // Copyright (c) 2011 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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
-#include "chrome/renderer/autofill_helper.h"
-#include "chrome/renderer/password_autocomplete_manager.h"
+#include "chrome/renderer/autofill/autofill_agent.h"
+#include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 26 matching lines @@
 
 const char* const kFormHTML =
     "<FORM name='LoginTestForm' action='http://www.bidule.com'>"
     "  <INPUT type='text' id='username'/>"
     "  <INPUT type='password' id='password'/>"
     "  <INPUT type='submit' value='Login'/>"
     "</FORM>";
 
 }  // namespace
 
-class PasswordAutocompleteManagerTest : public RenderViewTest {
+namespace autofill {
+
+class PasswordAutoFillManagerTest : public RenderViewTest {
  public:
-  PasswordAutocompleteManagerTest() {
+  PasswordAutoFillManagerTest() {
   }
 
   // Simulates the fill password form message being sent to the renderer.
   // We use that so we don't have to make RenderView::OnFillPasswordForm()
   // protected.
   void SimulateOnFillPasswordForm(
       const PasswordFormFillData& fill_data) {
     AutoFillMsg_FillPasswordForm msg(0, fill_data);
-    password_autocomplete_->OnMessageReceived(msg);
+    password_autofill_->OnMessageReceived(msg);
   }
 
   virtual void SetUp() {
     RenderViewTest::SetUp();
 
     // Add a preferred login and an additional login to the FillData.
     username1_ = ASCIIToUTF16(kAliceUsername);
     password1_ = ASCIIToUTF16(kAlicePassword);
     username2_ = ASCIIToUTF16(kBobUsername);
     password2_ = ASCIIToUTF16(kBobPassword);
@@ skipping 34 matching lines @@
     username_element_.setAutofilled(false);
     password_element_.setValue("");
     password_element_.setAutofilled(false);
   }
 
   void SimulateUsernameChange(const std::string& username,
                               bool move_caret_to_end) {
     username_element_.setValue(WebString::fromUTF8(username));
     if (move_caret_to_end)
       username_element_.setSelectionRange(username.length(), username.length());
-    autofill_helper_->textFieldDidChange(username_element_);
+    autofill_agent_->textFieldDidChange(username_element_);
     // Processing is delayed because of a WebKit bug, see
     // PasswordAutocompleteManager::TextDidChangeInTextField() for details.
     MessageLoop::current()->RunAllPending();
   }
 
   void SimulateKeyDownEvent(const WebInputElement& element,
                             ui::KeyboardCode key_code) {
     WebKit::WebKeyboardEvent key_event;
     key_event.windowsKeyCode = key_code;
-    autofill_helper_->textFieldDidReceiveKeyDown(element, key_event);
+    autofill_agent_->textFieldDidReceiveKeyDown(element, key_event);
   }
 
   void CheckTextFieldsState(const std::string& username,
                             bool username_autofilled,
                             const std::string& password,
                             bool password_autofilled) {
     EXPECT_EQ(username,
               static_cast<std::string>(username_element_.value().utf8()));
     EXPECT_EQ(username_autofilled, username_element_.isAutofilled());
     EXPECT_EQ(password,
@@ skipping 11 matching lines @@
   string16 username3_;
   string16 password1_;
   string16 password2_;
   string16 password3_;
   PasswordFormFillData fill_data_;
 
   WebInputElement username_element_;
   WebInputElement password_element_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(PasswordAutocompleteManagerTest);
+  DISALLOW_COPY_AND_ASSIGN(PasswordAutoFillManagerTest);
 };
 
+}
+
+using autofill::PasswordAutoFillManagerTest;
+
 // Tests that the password login is autocompleted as expected when the browser
 // sends back the password info.
-TEST_F(PasswordAutocompleteManagerTest, InitialAutocomplete) {
+TEST_F(PasswordAutoFillManagerTest, 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, NoInitialAutocompleteForReadOnly) {
+TEST_F(PasswordAutoFillManagerTest, 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, PasswordClearOnEdit) {
+TEST_F(PasswordAutoFillManagerTest, 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, WaitUsername) {
+TEST_F(PasswordAutoFillManagerTest, 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);
   SimulateUsernameChange("al", true);
   CheckTextFieldsState("al", false, "", false);
   SimulateUsernameChange(kAliceUsername, true);
   CheckTextFieldsState(kAliceUsername, false, "", false);
 
   // Autocomplete should happen only when the username textfield is blurred with
   // a full match.
   username_element_.setValue("a");
-  autofill_helper_->textFieldDidEndEditing(username_element_);
+  autofill_agent_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState("a", false, "", false);
   username_element_.setValue("al");
-  autofill_helper_->textFieldDidEndEditing(username_element_);
+  autofill_agent_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState("al", false, "", false);
   username_element_.setValue("alices");
-  autofill_helper_->textFieldDidEndEditing(username_element_);
+  autofill_agent_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState("alices", false, "", false);
   username_element_.setValue(ASCIIToUTF16(kAliceUsername));
-  autofill_helper_->textFieldDidEndEditing(username_element_);
+  autofill_agent_->textFieldDidEndEditing(username_element_);
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }
 
 // Tests that inline autocompletion works properly.
-TEST_F(PasswordAutocompleteManagerTest, InlineAutocomplete) {
+TEST_F(PasswordAutoFillManagerTest, 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 37 matching lines @@
   CheckUsernameSelection(1, 5);
   // Finally, the user removes all the text and types a lowercase 'c'.  We only
   // want case-sensitive autocompletion, so the username and the selected range
   // should be empty.
   SimulateUsernameChange("c", true);
   CheckTextFieldsState("c", false, "", false);
   CheckUsernameSelection(1, 1);
 }
 
 // Tests that selecting and item in the suggestion drop-down works.
-TEST_F(PasswordAutocompleteManagerTest, SuggestionSelect) {
+TEST_F(PasswordAutoFillManagerTest, 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
   // didSelectAutoFillSuggestion on the renderer.
-  autofill_helper_->didSelectAutoFillSuggestion(username_element_,
-                                                ASCIIToUTF16(kAliceUsername),
-                                                WebKit::WebString(),
-                                                0);
+  autofill_agent_->didSelectAutoFillSuggestion(username_element_,
+                                               ASCIIToUTF16(kAliceUsername),
+                                               WebKit::WebString(),
+                                               0);
 
   // Autocomplete should have kicked in.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
 }