Ozone Linux: Fix linker errors in interactive_ui_tests

chrome/test/base/interactive_ui_tests_main.cc

 // Copyright 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/test/base/chrome_test_launcher.h"
 
 #include "build/build_config.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "ui/base/test/ui_controls.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/base/test/ui_controls_aura.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
 #include "ui/views/test/ui_controls_factory_desktop_aurax11.h"
 #endif
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ash/test/ui_controls_factory_ash.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
@@ skipping 15 matching lines @@
     ui_controls::EnableUIControls();
 
 #if defined(OS_CHROMEOS)
     ui_controls::InstallUIControlsAura(ash::test::CreateAshUIControls());
 #elif defined(USE_AURA)
 #if defined(OS_WIN)
     com_initializer_.reset(new base::win::ScopedCOMInitializer());
 #endif
 
 #if defined(OS_LINUX)
+#if defined(USE_OZONE)
+    NOTIMPLEMENTED();

[sky, 2016/11/04 21:33:02]

Won't this basically make a bunch of tests not work/compile? Shouldn't those
tests be disabled or perhaps ifdefd?

[Tom (Use chromium acct), 2016/11/04 21:54:21]

Sorry I should have provided more context on this.  Currently the Linux Ozone
bot is compile-only.  The project is still in its very early stages so basically
none of the tests will work anyway.

This is to get around a linker error where CreateBrowserDesktopWindowTreeHost is
missing because it's not implemented yet on ozone.  The alternative would be to
stub out a CreateBrowserDesktopWindowTreeHostOzone with a bunch of
NOTIMPLEMENTED()'s.

+#else
     ui_controls::InstallUIControlsAura(
         views::test::CreateUIControlsDesktopAura());
+#endif  // defined(USE_OZONE)
 #else
     // TODO(win_ash): when running interactive_ui_tests for Win Ash, use above.
     ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(NULL));
-#endif
-#endif
+#endif  // defined(OS_LINUX)
+#endif  // defined(USE_AURA)
   }
 
   void Shutdown() override {
 #if defined(OS_WIN)
     com_initializer_.reset();
 #endif
   }
 
  private:
 #if defined(OS_WIN)
@@ skipping 27 matching lines @@
   // Run interactive_ui_tests serially, they do not support running in parallel.
   int default_jobs = 1;
   InteractiveUITestSuiteRunner runner;
   ChromeTestLauncherDelegate delegate(&runner);
   const int result = LaunchChromeTests(default_jobs, &delegate, argc, argv);
 #if defined(OS_WIN)
   KillAlwaysOnTopWindows(RunType::AFTER_TEST);
 #endif
   return result;
 }