MacViews: Fix build errors related to NativeWebKeyboardEvent

content/renderer/render_view_browsertest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 34 matching lines @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPerformance.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/range/range.h"
 
-#if defined(USE_AURA)
-#include "ui/events/event.h"
-#endif
-
 #if defined(USE_AURA) && defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/events/keycodes/keyboard_code_conversion.h"
@@ skipping 107 matching lines @@
     if (length != 1)
       return -1;
 
     // Create IPC messages from Windows messages and send them to our
     // back-end.
     // A keyboard event of Windows consists of three Windows messages:
     // WM_KEYDOWN, WM_CHAR, and WM_KEYUP.
     // WM_KEYDOWN and WM_KEYUP sends virtual-key codes. On the other hand,
     // WM_CHAR sends a composed Unicode character.
     MSG msg1 = { NULL, WM_KEYDOWN, key_code, 0 };
-#if defined(USE_AURA)
     ui::KeyEvent evt1(msg1);
-    NativeWebKeyboardEvent keydown_event(&evt1);
-#else
-    NativeWebKeyboardEvent keydown_event(msg1);
-#endif
+    NativeWebKeyboardEvent keydown_event(evt1);
     SendNativeKeyEvent(keydown_event);
 
     MSG msg2 = { NULL, WM_CHAR, (*output)[0], 0 };
-#if defined(USE_AURA)
     ui::KeyEvent evt2(msg2);
-    NativeWebKeyboardEvent char_event(&evt2);
-#else
-    NativeWebKeyboardEvent char_event(msg2);
-#endif
+    NativeWebKeyboardEvent char_event(evt2);
     SendNativeKeyEvent(char_event);
 
     MSG msg3 = { NULL, WM_KEYUP, key_code, 0 };
-#if defined(USE_AURA)
     ui::KeyEvent evt3(msg3);
-    NativeWebKeyboardEvent keyup_event(&evt3);
-#else
-    NativeWebKeyboardEvent keyup_event(msg3);
-#endif
+    NativeWebKeyboardEvent keyup_event(evt3);
     SendNativeKeyEvent(keyup_event);
 
     return length;
 #elif defined(USE_AURA) && defined(USE_X11)
     // We ignore |layout|, which means we are only testing the layout of the
     // current locale. TODO(mazda): fix this to respect |layout|.
     CHECK(output);
     const int flags = ConvertMockKeyboardModifier(modifiers);
 
     ui::ScopedXI2Event xevent;
     xevent.InitKeyEvent(ui::ET_KEY_PRESSED,
                         static_cast<ui::KeyboardCode>(key_code),
                         flags);
     ui::KeyEvent event1(xevent);
-    NativeWebKeyboardEvent keydown_event(&event1);
+    NativeWebKeyboardEvent keydown_event(event1);
     SendNativeKeyEvent(keydown_event);
 
     // X11 doesn't actually have native character events, but give the test
     // what it wants.
     xevent.InitKeyEvent(ui::ET_KEY_PRESSED,
                         static_cast<ui::KeyboardCode>(key_code),
                         flags);
     ui::KeyEvent event2(xevent);
     event2.set_character(GetCharacterFromKeyCode(event2.key_code(),
                                                  event2.flags()));
     ui::KeyEventTestApi test_event2(&event2);
     test_event2.set_is_char(true);
-    NativeWebKeyboardEvent char_event(&event2);
+    NativeWebKeyboardEvent char_event(event2);
     SendNativeKeyEvent(char_event);
 
     xevent.InitKeyEvent(ui::ET_KEY_RELEASED,
                         static_cast<ui::KeyboardCode>(key_code),
                         flags);
     ui::KeyEvent event3(xevent);
-    NativeWebKeyboardEvent keyup_event(&event3);
+    NativeWebKeyboardEvent keyup_event(event3);
     SendNativeKeyEvent(keyup_event);
 
     long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
                                      flags);
     output->assign(1, static_cast<base::char16>(c));
     return 1;
 #elif defined(USE_OZONE)
     const int flags = ConvertMockKeyboardModifier(modifiers);
 
     ui::KeyEvent keydown_event(ui::ET_KEY_PRESSED,
                                static_cast<ui::KeyboardCode>(key_code),
                                flags);
-    NativeWebKeyboardEvent keydown_web_event(&keydown_event);
+    NativeWebKeyboardEvent keydown_web_event(keydown_event);
     SendNativeKeyEvent(keydown_web_event);
 
     ui::KeyEvent char_event(keydown_event.GetCharacter(),
                             static_cast<ui::KeyboardCode>(key_code),
                             flags);
-    NativeWebKeyboardEvent char_web_event(&char_event);
+    NativeWebKeyboardEvent char_web_event(char_event);
     SendNativeKeyEvent(char_web_event);
 
     ui::KeyEvent keyup_event(ui::ET_KEY_RELEASED,
                              static_cast<ui::KeyboardCode>(key_code),
                              flags);
-    NativeWebKeyboardEvent keyup_web_event(&keyup_event);
+    NativeWebKeyboardEvent keyup_web_event(keyup_event);
     SendNativeKeyEvent(keyup_web_event);
 
     long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
                                      flags);
     output->assign(1, static_cast<base::char16>(c));
     return 1;
 #else
     NOTIMPLEMENTED();
     return L'\0';
 #endif
@@ skipping 2225 matching lines @@
 
   gfx::Size initial_size_;
 };
 
 TEST_F(RenderViewImplInitialSizeTest, InitialSize) {
   ASSERT_EQ(initial_size_, view_->GetSize());
   ASSERT_EQ(initial_size_, gfx::Size(view_->GetWebView()->size()));
 }
 
 }  // namespace content