Revert of Split content_shell dependencies for layout tests.

content/test/mock_webclipboard_impl.cc

 // Copyright 2013 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/mock_webclipboard_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 84 matching lines @@
   // for endianess reasons, it will be BGRA8888 on Windows.
   const SkBitmap& bitmap = m_image.getSkBitmap();
   SkAutoLockPixels lock(bitmap);
   gfx::PNGCodec::Encode(static_cast<unsigned char*>(bitmap.getPixels()),
 #if defined(OS_ANDROID)
                         gfx::PNGCodec::FORMAT_RGBA,
 #else
                         gfx::PNGCodec::FORMAT_BGRA,
 #endif
                         gfx::Size(bitmap.width(), bitmap.height()),
-                        static_cast<int>(bitmap.rowBytes()),
+                        bitmap.rowBytes(),
                         false /* discard_transparency */,
                         std::vector<gfx::PNGCodec::Comment>(),
                         &encoded_image);
   data.assign(reinterpret_cast<char*>(vector_as_array(&encoded_image)),
               encoded_image.size());
   return data;
 }
 
 blink::WebString MockWebClipboardImpl::readCustomData(
     blink::WebClipboard::Buffer buffer,
@@ skipping 70 matching lines @@
 
 void MockWebClipboardImpl::clear() {
   m_plainText = base::NullableString16();
   m_htmlText = base::NullableString16();
   m_image.reset();
   m_customData.clear();
   m_writeSmartPaste = false;
 }
 
 }  // namespace content