Re-lands 58186:

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 "base/keyboard_codes.h"
+#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"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
@@ skipping 93 matching lines @@
     username_element_.setValue(WebString::fromUTF8(username));
     if (move_caret_to_end)
       username_element_.setSelectionRange(username.length(), username.length());
     view_->textFieldDidChange(username_element_);
     // Processing is delayed because of a WebKit bug, see
     // PasswordAutocompleteManager::TextDidChangeInTextField() for details.
     MessageLoop::current()->RunAllPending();
   }
 
   void SimulateKeyDownEvent(const WebInputElement& element,
-                            base::KeyboardCode key_code) {
+                            app::KeyboardCode key_code) {
     WebKit::WebKeyboardEvent key_event;
     key_event.windowsKeyCode = key_code;
     view_->textFieldDidReceiveKeyDown(element, key_event);
   }
 
   void CheckTextFieldsState(const std::string& username,
                             bool username_autofilled,
                             const std::string& password,
                             bool password_autofilled) {
     EXPECT_EQ(username,
@@ skipping 151 matching lines @@
   CheckUsernameSelection(1, 5);
 
   // Now the user types the next letter of the same username, 'l'.
   SimulateUsernameChange("al", true);
   // Now the fields should have the same value, but the selection should have a
   // different start value.
   CheckTextFieldsState(kAliceUsername, true, kAlicePassword, true);
   CheckUsernameSelection(2, 5);
 
   // Test that deleting does not trigger autocomplete.
-  SimulateKeyDownEvent(username_element_, base::VKEY_BACK);
+  SimulateKeyDownEvent(username_element_, app::VKEY_BACK);
   SimulateUsernameChange("alic", true);
   CheckTextFieldsState("alic", false, "", false);
   CheckUsernameSelection(4, 4);  // No selection.
   // Reset the last pressed key to something other than backspace.
-  SimulateKeyDownEvent(username_element_, base::VKEY_A);
+  SimulateKeyDownEvent(username_element_, app::VKEY_A);
 
   // Now lets say the user goes astray from the stored username and types the
   // letter 'f', spelling 'alf'.  We don't know alf (that's just sad), so in
   // practice the username should no longer be 'alice' and the selected range
   // should be empty.
   SimulateUsernameChange("alf", true);
   CheckTextFieldsState("alf", false, "", false);
   CheckUsernameSelection(3, 3);  // No selection.
 
   // Ok, so now the user removes all the text and enters the letter 'b'.
@@ skipping 15 matching lines @@
   // 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