ozone: Fix interactive_ui_tests build

chrome/browser/extensions/extension_commands_global_registry_apitest.cc

 // Copyright (c) 2013 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 "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 12 matching lines @@
 #if defined(OS_MACOSX)
 #include <Carbon/Carbon.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
 namespace extensions {
 
 typedef ExtensionApiTest GlobalCommandsApiTest;
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && defined(USE_X11)

[sky, 2014/07/09 20:17:49]

Do we need the OS_LINUX conditions in the ifdefs here and other files?

 // Send a simulated key press and release event, where |control|, |shift| or
 // |alt| indicates whether the key is struck with corresponding modifier.
 void SendNativeKeyEventToXDisplay(ui::KeyboardCode key,
                                   bool control,
                                   bool shift,
                                   bool alt) {
   Display* display = gfx::GetXDisplay();
   KeyCode ctrl_key_code = XKeysymToKeycode(display, XK_Control_L);
   KeyCode shift_key_code = XKeysymToKeycode(display, XK_Shift_L);
   KeyCode alt_key_code = XKeysymToKeycode(display, XK_Alt_L);
@@ skipping 20 matching lines @@
   // Simulate the keys being pressed.
   for (KeyCodes::iterator it = key_codes.begin(); it != key_codes.end(); it++)
     XTestFakeKeyEvent(display, *it, True, CurrentTime);
 
   // Simulate the keys being released.
   for (KeyCodes::iterator it = key_codes.begin(); it != key_codes.end(); it++)
     XTestFakeKeyEvent(display, *it, False, CurrentTime);
 
   XFlush(display);
 }
-#endif  // OS_LINUX
+#endif  // OS_LINUX && USE_X11
 
 #if defined(OS_MACOSX)
 using base::ScopedCFTypeRef;
 
 void SendNativeCommandShift(int key_code) {
   CGEventSourceRef event_source =
       CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
   CGEventTapLocation event_tap_location = kCGHIDEventTap;
 
   // Create the keyboard press events.
@@ skipping 60 matching lines @@
   // incognito browser. Both shortcuts should have no effect (extension is not
   // loaded there).
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       incognito_browser, ui::VKEY_1, true, true, false, false));
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       incognito_browser, ui::VKEY_A, true, true, false, false));
 
   // Activate the shortcut (Ctrl+Shift+9). This should have an effect.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       incognito_browser, ui::VKEY_9, true, true, false, false));
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) && defined(USE_X11)
   // Create an incognito browser to capture the focus.
   CreateIncognitoBrowser();
 
   // On Linux, our infrastructure for sending keys just synthesize keyboard
   // event and send them directly to the specified window, without notifying the
   // X root window. It didn't work while testing global shortcut because the
   // stuff of global shortcut on Linux need to be notified when KeyPress event
   // is happening on X root window. So we simulate the keyboard input here.
   SendNativeKeyEventToXDisplay(ui::VKEY_1, true, true, false);
   SendNativeKeyEventToXDisplay(ui::VKEY_A, true, true, false);
@@ skipping 42 matching lines @@
                             false,
                             false,
                             false);
 
   // We should get two success result.
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace extensions