Remove ImageTransportFactory::CreateTransportClient

content/browser/compositor/image_transport_factory_browsertest.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 "base/run_loop.h"
 #include "cc/output/context_provider.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/test/content_browser_test.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ skipping 20 matching lines @@
 #endif
 // Checks that upon context loss, the observer is called and the created
 // resources are reset.
 IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest,
                        MAYBE_TestLostContext) {
   // This test doesn't make sense in software compositing mode.
   if (!GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor())
     return;
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  scoped_refptr<ui::Texture> texture = factory->CreateTransportClient(1.f);
+  ui::ContextFactory* context_factory = ui::ContextFactory::GetInstance();
+  gpu::gles2::GLES2Interface* gl =
+      context_factory->SharedMainThreadContextProvider()->ContextGL();
+  unsigned int texture_id = 0;

[danakj, 2014/04/08 14:34:18]

nit: uint32?

[piman, 2014/04/08 17:34:22]

Made it a GLuint, which is what GenTextures takes.

+  gl->GenTextures(1, &texture_id);
+
+  scoped_refptr<ui::Texture> texture =
+      factory->CreateOwnedTexture(gfx::Size(1, 1), 1.f, texture_id);
   ASSERT_TRUE(texture.get());
 
   MockImageTransportFactoryObserver observer;
   factory->AddObserver(&observer);
 
   base::RunLoop run_loop;
   EXPECT_CALL(observer, OnLostResources())
       .WillOnce(testing::InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
 
-  ui::ContextFactory* context_factory = ui::ContextFactory::GetInstance();
-
-  gpu::gles2::GLES2Interface* gl =
-      context_factory->SharedMainThreadContextProvider()->ContextGL();
   gl->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
                           GL_INNOCENT_CONTEXT_RESET_ARB);
 
   // We have to flush to make sure that the client side gets a chance to notice
   // the context is gone.
   gl->Flush();
 
   run_loop.Run();
   EXPECT_EQ(0u, texture->PrepareTexture());
 
   factory->RemoveObserver(&observer);
 }
 
 }  // anonymous namespace
 }  // namespace content