Re-lands 58186:

app/keyboard_code_conversion_mac.h

Index: app/keyboard_code_conversion_mac.h
diff --git a/base/keyboard_code_conversion_mac.h b/app/keyboard_code_conversion_mac.h
similarity index 84%
rename from base/keyboard_code_conversion_mac.h
rename to app/keyboard_code_conversion_mac.h
index 9db6e4798efe9099854eb1aafca010eb69b675ba..2082c837002d96346187344bee679e6c6f8b1cf6 100644
--- a/base/keyboard_code_conversion_mac.h
+++ b/app/keyboard_code_conversion_mac.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_KEYBOARD_CODE_CONVERSION_MAC_H_
-#define BASE_KEYBOARD_CODE_CONVERSION_MAC_H_
+#ifndef APP_KEYBOARD_CODE_CONVERSION_MAC_H_
+#define APP_KEYBOARD_CODE_CONVERSION_MAC_H_
 
 #import <Cocoa/Cocoa.h>
-#include "basictypes.h"
-#include "base/keyboard_codes_posix.h"
+#include "app/keyboard_codes_posix.h"
+#include "base/basictypes.h"
 
-namespace base {
+namespace app {
 
 // We use windows virtual keycodes throughout our keyboard event related code,
 // including unit tests. But Mac uses a different set of virtual keycodes.
@@ -29,6 +29,6 @@ int MacKeyCodeForWindowsKeyCode(KeyboardCode keycode,
                                 unichar* character,
                                 unichar* characterIgnoringModifiers);
 
-} // namespace base
+} // namespace app
 
-#endif  // BASE_KEYBOARD_CODE_CONVERSION_MAC_H_
+#endif  // APP_KEYBOARD_CODE_CONVERSION_MAC_H_