Fix content_unittests for Ozone GBM

content/test/content_test_suite.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 "content/test/content_test_suite.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 #include <map>
@@ skipping 26 matching lines @@
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "base/memory/linked_ptr.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"
 #endif
 
+#if defined (USE_OZONE)
+#include "base/message_loop/message_loop.h"
+#endif
+
 namespace content {
 namespace {
 
 class TestInitializationListener : public testing::EmptyTestEventListener {
  public:
   TestInitializationListener() : test_content_client_initializer_(NULL) {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) override {
     test_content_client_initializer_ =
@@ skipping 46 matching lines @@
 ContentTestSuite::~ContentTestSuite() {
 }
 
 void ContentTestSuite::Initialize() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #if !defined(OS_IOS)
   mock_cr_app::RegisterMockCrApp();
 #endif
 #endif
-
+#if defined(USE_OZONE)
+  base::MessageLoopForUI main_loop;

[sky, 2015/03/30 14:46:38]

None of the other platforms initialize the message loop here. Why does ozone
need to do it here and not else where like other platforms?

[vignatti (out of this project), 2015/03/30 15:01:50]

A few Ozone implementations like the GBM requires early initialization of the
message loop because GL stuff, display management and etc (most of hardware
accesses) happen in the GPU process only. So we need the message loop in place
already for the GPU process initial handshake behave correctly... ideally X11
backend ought to be like that.

I can write a comment in the code like that if you prefer.

+#endif
 #if defined(OS_WIN)
   gfx::InitDeviceScaleFactor(1.0f);
 #endif
 
   ContentTestSuiteBase::Initialize();
   {
     ContentClient client;
     ContentTestSuiteBase::RegisterContentSchemes(&client);
   }
   RegisterPathProvider();
 #if !defined(OS_IOS)
   media::InitializeMediaLibraryForTesting();
   // When running in a child process for Mac sandbox tests, the sandbox exists
   // to initialize GL, so don't do it here.
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kTestChildProcess)) {
     gfx::GLSurface::InitializeOneOffForTests();
     gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
   }
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl);
 #endif
 }
 
 }  // namespace content