Revert of Update GPU memory buffers to use StrideInBytes internally.

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.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 "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "content/common/android/surface_texture_manager.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 57 matching lines @@
 
   DCHECK(!mapped_);
   DCHECK(native_window_);
   ANativeWindow_Buffer buffer;
   int status = ANativeWindow_lock(native_window_, &buffer, NULL);
   if (status) {
     VLOG(1) << "ANativeWindow_lock failed with error code: " << status;
     return NULL;
   }
 
-  size_t stride_in_bytes = 0;
-  if (!StrideInBytes(buffer.stride, format_, &stride_in_bytes))
-    return NULL;
-
   DCHECK_LE(size_.width(), buffer.stride);
-  stride_ = stride_in_bytes;
+  stride_ = buffer.stride * BytesPerPixel(format_);
   mapped_ = true;
   return buffer.bits;
 }
 
 void GpuMemoryBufferImplSurfaceTexture::Unmap() {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Unmap");
 
   DCHECK(mapped_);
   ANativeWindow_unlockAndPost(native_window_);
   mapped_ = false;
 }
 
 uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const {
   return stride_;
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content