Get mus_ws_unittests working with Ozone X11.

services/ui/ws/window_manager_client_unittest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 335 matching lines @@
   };
 
   void EmbedCallbackImpl(bool result) {
     embed_details_->callback_run = true;
     embed_details_->embed_result = result;
     if (embed_details_->waiting &&
         (!result || embed_details_->result->window_tree_client))
       EXPECT_TRUE(WindowServerTestBase::QuitRunLoop());
   }
 
+#if defined(USE_OZONE)
+  // mojo::test::ServiceTest::
+  std::unique_ptr<base::MessageLoop> CreateMessageLoop() override {
+    // TYPE_UI is needed for platform events coming from libevent.

[sky, 2017/02/02 16:27:05]

Is there any harm in doing this every where, not just ozone?

[rjkroege, 2017/02/02 16:38:42]

There is a possibility of increased flake (see discussion in
https://codereview.chromium.org/2629983002/) if we use it when not necessary.

I have a different nit (that could be addressed with a TODO) that when we should
be so lucky as to have DRM or Wayland builders, this code will needlessly use a
UI message loop yes?


 

[kylechar, 2017/02/02 18:01:29]

rjkroege: Confusingly, this is actually something different. These tests are for
parts of mus-ws process, which is always TYPE_UI (even for Ozone DRM). The Ozone
MessageLoop type stuff we've been discussing is for the GPU process, which only
needs TYPE_UI when running X11.

sky: There shouldn't be any harm in having this always be TYPE_UI. In fact, the
code needs to be able to run with TYPE_UI, so it's probably better? Changed.

+    return base::MakeUnique<base::MessageLoop>(base::MessageLoop::TYPE_UI);
+  }
+#endif
+
   std::unique_ptr<EmbedDetails> embed_details_;
 
   std::unique_ptr<ClientAreaChange> client_area_change_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServerTest);
 };
 
 TEST_F(WindowServerTest, RootWindow) {
   ASSERT_NE(nullptr, window_manager());
   EXPECT_EQ(1u, window_manager()->GetRoots().size());
@@ skipping 394 matching lines @@
   ASSERT_EQ(1u, top_level_in_wm->children().size());
   aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0];
   ASSERT_EQ(1u, second_client_child_in_wm->children().size());
   aura::Window* transient_in_wm = second_client_child_in_wm->children()[0];
   ASSERT_EQ(second_client_child_in_wm,
             transient_window_client->GetTransientParent(transient_in_wm));
 }
 
 }  // namespace ws
 }  // namespace ui