[Ozone-DRI] Assume window IPC arrives before surface IPC

ui/ozone/platform/dri/ozone_platform_gbm.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 "ui/ozone/platform/dri/ozone_platform_gbm.h"
 
 #include <dlfcn.h>
 #include <gbm.h>
 #include <stdlib.h>
 
@@ skipping 143 matching lines @@
     // Async page flips are supported only on surfaceless mode.
     gbm_.reset(new GbmWrapper(kDefaultGraphicsCardPath));
     gbm_->Initialize();
     buffer_generator_.reset(new GbmBufferGenerator());
     screen_manager_.reset(
         new ScreenManager(gbm_.get(), buffer_generator_.get()));
     window_delegate_manager_.reset(new DriWindowDelegateManager());
     if (!surface_factory_ozone_)
       surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
 
-    surface_factory_ozone_->InitializeGpu(gbm_.get(), screen_manager_.get(),
+    surface_factory_ozone_->InitializeGpu(gbm_.get(),
                                           window_delegate_manager_.get());
     scoped_ptr<NativeDisplayDelegateDri> ndd(
         new NativeDisplayDelegateDri(gbm_.get(), screen_manager_.get()));
     ndd->Initialize();
     gpu_platform_support_.reset(
         new DriGpuPlatformSupport(gbm_.get(), window_delegate_manager_.get(),
                                   screen_manager_.get(), ndd.Pass()));
   }
 
  private:
@@ skipping 29 matching lines @@
 OzonePlatform* CreateOzonePlatformGbm() {
   base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
 #if defined(USE_MESA_PLATFORM_NULL)
   // Only works with surfaceless.
   cmd->AppendSwitch(switches::kOzoneUseSurfaceless);
 #endif
   return new OzonePlatformGbm(cmd->HasSwitch(switches::kOzoneUseSurfaceless));
 }
 
 }  // namespace ui