Enable RenderViewImplTest.{OnHandleKeyboardEvent,InsertCharacters} for Aura on X11.

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2011 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 "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/view_messages.h"
@@ skipping 503 matching lines @@
 
     // Copy the document content to std::wstring and compare with the
     // expected result.
     const int kMaxOutputCharacters = 16;
     std::wstring output = UTF16ToWideHack(
         GetMainFrame()->contentAsText(kMaxOutputCharacters));
     EXPECT_EQ(output, kTextDirection[i].expected_result);
   }
 }
 
-#if defined(USE_AURA)
-// crbug.com/103499.
-#define MAYBE_OnHandleKeyboardEvent DISABLED_OnHandleKeyboardEvent
-#else
-#define MAYBE_OnHandleKeyboardEvent OnHandleKeyboardEvent
-#endif
-
 // Test that we can receive correct DOM events when we send input events
 // through the RenderWidget::OnHandleInputEvent() function.
-TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
+TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) {
 #if !defined(OS_MACOSX)
   // Load an HTML page consisting of one <input> element and three
   // contentediable <div> elements.
   // The <input> element is used for sending keyboard events, and the <div>
   // elements are used for writing DOM events in the following format:
   //   "<keyCode>,<shiftKey>,<controlKey>,<altKey>".
   // TODO(hbono): <http://crbug.com/2215> Our WebKit port set |ev.metaKey| to
   // true when pressing an alt key, i.e. the |ev.metaKey| value is not
   // trustworthy. We will check the |ev.metaKey| value when this issue is fixed.
   view()->set_send_content_state_immediately(true);
@@ skipping 87 matching lines @@
 #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];
-        std::wstring char_code;
+        string16 char_code;
         if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
           continue;
 
         // Create an expected result from the virtual-key code, the character
         // code, and the modifier-key status.
         // We format a string that emulates a DOM-event string produced hy
         // our JavaScript function. (See the above comment for the format.)
         static char expected_result[1024];
         expected_result[0] = 0;
         base::snprintf(&expected_result[0],
@@ skipping 15 matching lines @@
             GetMainFrame()->contentAsText(kMaxOutputCharacters));
         EXPECT_EQ(expected_result, output);
       }
     }
   }
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
-#if defined(USE_AURA)
-// crbug.com/103499.
-#define MAYBE_InsertCharacters DISABLED_InsertCharacters
-#else
-#define MAYBE_InsertCharacters InsertCharacters
-#endif
-
 // Test that our EditorClientImpl class can insert characters when we send
 // keyboard events through the RenderWidget::OnHandleInputEvent() function.
 // This test is for preventing regressions caused only when we use non-US
 // keyboards, such as Issue 10846.
-TEST_F(RenderViewImplTest, MAYBE_InsertCharacters) {
+TEST_F(RenderViewImplTest, InsertCharacters) {
 #if !defined(OS_MACOSX)
   static const struct {
     MockKeyboard::Layout layout;
     const wchar_t* expected_result;
   } kLayouts[] = {
 #if 0
     // Disabled these keyboard layouts because buildbots do not have their
     // keyboard-layout drivers installed.
     {MockKeyboard::LAYOUT_ARABIC,
      L"\x0030\x0031\x0032\x0033\x0034\x0035\x0036\x0037"
@@ skipping 180 matching lines @@
 #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];
-        std::wstring char_code;
+        string16 char_code;
         if (SendKeyEvent(layout, key_code, modifiers, &char_code) < 0)
           continue;
       }
     }
 
     // Retrieve the text in the test page and compare it with the expected
     // text created from a virtual-key code, a character code, and the
     // modifier-key status.
     const int kMaxOutputCharacters = 4096;
     std::wstring output = UTF16ToWideHack(
@@ skipping 191 matching lines @@
   expected_page_id_2 = view()->page_id_;
   EXPECT_GT(expected_page_id_2, expected_page_id);
   view()->OnSetHistoryLengthAndPrune(2, -1);
   EXPECT_EQ(4, view()->history_list_length_);
   EXPECT_EQ(3, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]);
 }