Re-lands 58186:

chrome/renderer/render_view_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 "base/basictypes.h"
 
+#include "app/keyboard_codes.h"
 #include "base/file_util.h"
-#include "base/keyboard_codes.h"
 #include "base/shared_memory.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/test/render_view_test.h"
 #include "gfx/codec/jpeg_codec.h"
 #include "net/base/net_errors.h"
@@ skipping 552 matching lines @@
 
     MockKeyboard::Layout layout = kLayouts[i];
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kModifierData); ++j) {
       // Virtual key codes used for this test.
       static const int kKeyCodes[] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
         'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
         'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
         'W', 'X', 'Y', 'Z',
-        base::VKEY_OEM_1,
-        base::VKEY_OEM_PLUS,
-        base::VKEY_OEM_COMMA,
-        base::VKEY_OEM_MINUS,
-        base::VKEY_OEM_PERIOD,
-        base::VKEY_OEM_2,
-        base::VKEY_OEM_3,
-        base::VKEY_OEM_4,
-        base::VKEY_OEM_5,
-        base::VKEY_OEM_6,
-        base::VKEY_OEM_7,
+        app::VKEY_OEM_1,
+        app::VKEY_OEM_PLUS,
+        app::VKEY_OEM_COMMA,
+        app::VKEY_OEM_MINUS,
+        app::VKEY_OEM_PERIOD,
+        app::VKEY_OEM_2,
+        app::VKEY_OEM_3,
+        app::VKEY_OEM_4,
+        app::VKEY_OEM_5,
+        app::VKEY_OEM_6,
+        app::VKEY_OEM_7,
 #if defined(OS_WIN)
         // Not sure how to handle this key on Linux.
-        base::VKEY_OEM_8,
+        app::VKEY_OEM_8,
 #endif
       };
 
       MockKeyboard::Modifiers modifiers = kModifierData[j].modifiers;
       for (size_t k = 0; k < ARRAYSIZE_UNSAFE(kKeyCodes); ++k) {
         // Send a keyboard event to the RenderView object.
         // We should test a keyboard event only when the given keyboard-layout
         // driver is installed in a PC and the driver can assign a Unicode
         // charcter for the given tuple (key-code and modifiers).
         int key_code = kKeyCodes[k];
@@ skipping 205 matching lines @@
 
     MockKeyboard::Layout layout = kLayouts[i].layout;
     for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kModifiers); ++j) {
       // Virtual key codes used for this test.
       static const int kKeyCodes[] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
         'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
         'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
         'W', 'X', 'Y', 'Z',
-        base::VKEY_OEM_1,
-        base::VKEY_OEM_PLUS,
-        base::VKEY_OEM_COMMA,
-        base::VKEY_OEM_MINUS,
-        base::VKEY_OEM_PERIOD,
-        base::VKEY_OEM_2,
-        base::VKEY_OEM_3,
-        base::VKEY_OEM_4,
-        base::VKEY_OEM_5,
-        base::VKEY_OEM_6,
-        base::VKEY_OEM_7,
+        app::VKEY_OEM_1,
+        app::VKEY_OEM_PLUS,
+        app::VKEY_OEM_COMMA,
+        app::VKEY_OEM_MINUS,
+        app::VKEY_OEM_PERIOD,
+        app::VKEY_OEM_2,
+        app::VKEY_OEM_3,
+        app::VKEY_OEM_4,
+        app::VKEY_OEM_5,
+        app::VKEY_OEM_6,
+        app::VKEY_OEM_7,
 #if defined(OS_WIN)
         // Unclear how to handle this on Linux.
-        base::VKEY_OEM_8,
+        app::VKEY_OEM_8,
 #endif
       };
 
       MockKeyboard::Modifiers modifiers = kModifiers[j];
       for (size_t k = 0; k < ARRAYSIZE_UNSAFE(kKeyCodes); ++k) {
         // Send a keyboard event to the RenderView object.
         // We should test a keyboard event only when the given keyboard-layout
         // driver is installed in a PC and the driver can assign a Unicode
         // charcter for the given tuple (layout, key-code, and modifiers).
         int key_code = kKeyCodes[k];
@@ skipping 307 matching lines @@
   LoadHTML("<html><head><meta http-equiv=\"content-language\" "
            "content=\" fr , es,en \">"
            "</head><body>A random page with random content.</body></html>");
   ProcessPendingMessages();
   message = render_thread_.sink().GetUniqueMessageMatching(
       ViewHostMsg_PageContents::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ViewHostMsg_PageContents::Read(message, &params);
   EXPECT_EQ("fr", params.d);
 }