Move app/key* to ui/base/keycodes/*

chrome/browser/autofill/autofill_browsertest.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 <string>
 
 #include "base/utf_string_conversions.h"
-#include "app/keyboard_code_conversion.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/mock_render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/translate_helper.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/keycodes/keyboard_code_conversion.h"
 
 static const char* kTestFormString =
     "<form action=\"http://www.google.com/\" method=\"POST\">"
     "<label for=\"firstname\">First name:</label>"
     " <input type=\"text\" id=\"firstname\""
     "        onFocus=\"domAutomationController.send(true)\""
     " /><br />"
     "<label for=\"lastname\">Last name:</label>"
     " <input type=\"text\" id=\"lastname\" /><br />"
     "<label for=\"address1\">Address line 1:</label>"
@@ skipping 109 matching lines @@
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                              VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
     bool result = false;
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
         rvh(), L"", L"document.getElementById('firstname').focus();", &result));
     ASSERT_TRUE(result);
     // Start filling the first name field with "M" and wait for the popup to be
     // shown.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), app::VKEY_M, false, true, false, false,
+        browser(), ui::VKEY_M, false, true, false, false,
         NotificationType::AUTOFILL_DID_SHOW_SUGGESTIONS,
         Source<RenderViewHost>(rvh())));
 
     // Press the down arrow to select the suggestion and preview the autofilled
     // form.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), app::VKEY_DOWN, false, false, false, false,
+        browser(), ui::VKEY_DOWN, false, false, false, false,
         NotificationType::AUTOFILL_DID_FILL_FORM_DATA,
         Source<RenderViewHost>(rvh())));
 
     // The previewed values should not be accessible to JavaScript.
     ExpectFieldValue(L"firstname", "M");
     ExpectFieldValue(L"lastname", "");
     ExpectFieldValue(L"address1", "");
     ExpectFieldValue(L"address2", "");
     ExpectFieldValue(L"city", "");
     ExpectFieldValue(L"state", "");
     ExpectFieldValue(L"zip", "");
     ExpectFieldValue(L"country", "");
     ExpectFieldValue(L"phone", "");
     // TODO(isherman): It would be nice to test that the previewed values are
     // displayed: http://crbug.com/57220
 
     // Press Enter to accept the autofill suggestions.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
-        browser(), app::VKEY_RETURN, false, false, false, false,
+        browser(), ui::VKEY_RETURN, false, false, false, false,
         NotificationType::AUTOFILL_DID_FILL_FORM_DATA,
         Source<RenderViewHost>(rvh())));
 
     // The form should be filled.
     ExpectFieldValue(L"firstname", "Milton");
     ExpectFieldValue(L"lastname", "Waddams");
     ExpectFieldValue(L"address1", "4120 Freidrich Lane");
     ExpectFieldValue(L"address2", "Basement");
     ExpectFieldValue(L"city", "Austin");
     ExpectFieldValue(L"state", "TX");
@@ skipping 79 matching lines @@
   // But right now, the call stucks here.
   // Once click the text field, it starts again.
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
       rvh(), L"", L"cr.googleTranslate.onTranslateElementLoad();"));
 
   // Simulate the render notifying the translation has been done.
   ui_test_utils::WaitForNotification(NotificationType::PAGE_TRANSLATED);
 
   TryBasicFormFillWithMKey();
 }