ozone: Initialize a subsystem only if necessary.

ui/ozone/platform/egltest/ozone_platform_egltest.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/egltest/ozone_platform_egltest.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 187 matching lines @@
 }
 
 // Test platform for EGL.
 //
 // This is a tiny EGL-based platform. Creation of the native window is
 // handled by a separate library called eglplatform_shim.so.1 because
 // this itself is platform specific and we want to test out multiple
 // hardware platforms.
 class OzonePlatformEgltest : public OzonePlatform {
  public:
-  OzonePlatformEgltest()
-      : device_manager_(CreateDeviceManager()),
-        surface_factory_ozone_(&eglplatform_shim_),
-        event_factory_ozone_(NULL, device_manager_.get()),
-        shim_initialized_(false) {}
+  OzonePlatformEgltest() : shim_initialized_(false) {}
   virtual ~OzonePlatformEgltest() {
     if (shim_initialized_)
       eglplatform_shim_.ShimTerminate();
   }
 
   void LoadShim() {
     std::string library = GetShimLibraryName();
 
     if (eglplatform_shim_.Load(library))
       return;
 
     base::FilePath module_path;
     if (!PathService::Get(base::DIR_MODULE, &module_path))
       LOG(ERROR) << "failed to get DIR_MODULE from PathService";
     base::FilePath library_path = module_path.Append(library);
 
     if (eglplatform_shim_.Load(library_path.value()))
       return;
 
     LOG(FATAL) << "failed to load " << library;
   }
 
   void Initialize() {
     LoadShim();
     shim_initialized_ = eglplatform_shim_.ShimInitialize();
   }
 
   // OzonePlatform:
   virtual gfx::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE {
-    return &surface_factory_ozone_;
+    return surface_factory_ozone_.get();
   }
   virtual EventFactoryOzone* GetEventFactoryOzone() OVERRIDE {
-    return &event_factory_ozone_;
+    return event_factory_ozone_.get();
   }
   virtual InputMethodContextFactoryOzone* GetInputMethodContextFactoryOzone()
       OVERRIDE {
-    return &input_method_context_factory_ozone_;
+    return input_method_context_factory_ozone_.get();
   }
   virtual CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE {
-    return &cursor_factory_ozone_;
+    return cursor_factory_ozone_.get();
   }
 
 #if defined(OS_CHROMEOS)
   virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
       OVERRIDE {
     return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());
   }
 #endif
 
+  virtual void InitializeUI() OVERRIDE {
+    device_manager_ = CreateDeviceManager();
+    surface_factory_ozone_.reset(new SurfaceFactoryEgltest(&eglplatform_shim_));
+    event_factory_ozone_.reset(
+        new EventFactoryEvdev(NULL, device_manager_.get()));
+    input_method_context_factory_ozone_.reset(
+        new InputMethodContextFactoryOzone());
+    cursor_factory_ozone_.reset(new CursorFactoryOzone());
+  }
+
+  virtual void InitializeGPU() OVERRIDE {}
+
  private:
   LibeglplatformShimLoader eglplatform_shim_;
   scoped_ptr<DeviceManager> device_manager_;
-  SurfaceFactoryEgltest surface_factory_ozone_;
-  EventFactoryEvdev event_factory_ozone_;
-  InputMethodContextFactoryOzone input_method_context_factory_ozone_;
-  CursorFactoryOzone cursor_factory_ozone_;
+  scoped_ptr<SurfaceFactoryEgltest> surface_factory_ozone_;
+  scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
+  scoped_ptr<InputMethodContextFactoryOzone>
+      input_method_context_factory_ozone_;
+  scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
 
   bool shim_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformEgltest);
 };
 
 }  // namespace
 
 OzonePlatform* CreateOzonePlatformEgltest() {
   OzonePlatformEgltest* platform = new OzonePlatformEgltest;
   platform->Initialize();
   return platform;
 }
 
 }  // namespace ui