gl, ozone: enable GLImageBindTest unittests

ui/gl/gl_image_ref_counted_memory_unittest.cc

 // Copyright 2015 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 <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_image_ref_counted_memory.h"
+#include "ui/gl/gl_utils.h"
 #include "ui/gl/test/gl_image_test_template.h"
 
 namespace gl {
 namespace {
 
 template <gfx::BufferFormat format>
 class GLImageRefCountedMemoryTestDelegate {
  public:
   scoped_refptr<gl::GLImage> CreateSolidColorImage(
       const gfx::Size& size,
       const uint8_t color[4]) const {
     DCHECK_EQ(NumberOfPlanesForBufferFormat(format), 1u);
     std::vector<uint8_t> data(gfx::BufferSizeForBufferFormat(size, format));
     scoped_refptr<base::RefCountedBytes> bytes(new base::RefCountedBytes(data));
     GLImageTestSupport::SetBufferDataToColor(
         size.width(), size.height(),
         static_cast<int>(RowSizeForBufferFormat(size.width(), format, 0)),
         format, color, &bytes->data().front());
-    scoped_refptr<GLImageRefCountedMemory> image(new GLImageRefCountedMemory(
-        size, gl::GLImageMemory::GetInternalFormatForTesting(format)));
+    scoped_refptr<GLImageRefCountedMemory> image(
+        new GLImageRefCountedMemory(size, gl::GetTextureFormatFrom(format)));
     bool rv = image->Initialize(bytes.get(), format);
     EXPECT_TRUE(rv);
     return image;
   }
 };
 
 using GLImageTestTypes = testing::Types<
     GLImageRefCountedMemoryTestDelegate<gfx::BufferFormat::RGBX_8888>,
     GLImageRefCountedMemoryTestDelegate<gfx::BufferFormat::RGBA_8888>,
     GLImageRefCountedMemoryTestDelegate<gfx::BufferFormat::BGRX_8888>,
     GLImageRefCountedMemoryTestDelegate<gfx::BufferFormat::BGRA_8888>>;
 
 INSTANTIATE_TYPED_TEST_CASE_P(GLImageRefCountedMemory,
                               GLImageTest,
                               GLImageTestTypes);
 
 INSTANTIATE_TYPED_TEST_CASE_P(GLImageRefCountedMemory,
                               GLImageCopyTest,
                               GLImageTestTypes);
 
 }  // namespace
 }  // namespace gl