ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

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"
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
@@ skipping 17 matching lines @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "media/base/media.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/in_process_surface_texture_manager.h"
 #endif
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/native_pixmap_manager.h"
+#endif
+
 namespace content {
 namespace {
 
 class TestInitializationListener : public testing::EmptyTestEventListener {
  public:
   TestInitializationListener() : test_content_client_initializer_(NULL) {
   }
 
   void OnTestStart(const testing::TestInfo& test_info) override {
     test_content_client_initializer_ =
@@ skipping 34 matching lines @@
   ContentTestSuiteBase::Initialize();
   {
     ContentClient client;
     ContentTestSuiteBase::RegisterContentSchemes(&client);
   }
   RegisterPathProvider();
 #if !defined(OS_IOS)
   media::InitializeMediaLibrary();
   // 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)) {
+  bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kTestChildProcess);
+  if (!is_child_process) {
     gfx::GLSurfaceTestSupport::InitializeOneOff();
     gpu::ApplyGpuDriverBugWorkarounds(base::CommandLine::ForCurrentProcess());
   }
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
   SurfaceTextureManager::SetInstance(
       InProcessSurfaceTextureManager::GetInstance());
 #endif
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance());
 #endif
+#if defined(USE_OZONE)
+  if (!is_child_process) {
+    ui::NativePixmapManager::SetInstance(
+        ui::NativePixmapManager::Create().release());

[reveman, 2015/07/23 18:25:23]

Don't leak the manager instance here as well.

[dshwang, 2015/07/24 12:19:00]

Done.

+  }
+#endif
 }
 
 }  // namespace content