Re-lands 58186:

chrome/browser/extensions/extension_input_api.cc

Index: chrome/browser/extensions/extension_input_api.cc
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index 40c4bc086e8c85a8d2bae7a570759a407dda361b..c4ce3f6e2527af970d173c83e753439f3c4a9ae2 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -6,8 +6,8 @@
 
 #include <string>
 
+#include "app/keyboard_code_conversion.h"
 #include "base/values.h"
-#include "base/keyboard_code_conversion.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
@@ -84,8 +84,8 @@ bool SendKeyboardEventInputFunction::RunImpl() {
 
   std::string identifier;
   EXTENSION_FUNCTION_VALIDATE(args->GetString(kKeyIdentifier, &identifier));
-  base::KeyboardCode code = base::KeyCodeFromKeyIdentifier(identifier);
-  if (code == base::VKEY_UNKNOWN) {
+  app::KeyboardCode code = app::KeyCodeFromKeyIdentifier(identifier);
+  if (code == app::VKEY_UNKNOWN) {
     error_ = kUnknownOrUnsupportedKeyIdentiferError;
     return false;
   }