summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 02:25:58 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 02:25:58 +0000
commit97f973c80b84b13e9df161ed3fa1874217fb25a1 (patch)
treea933c844e2a4be37e6df03b7af81926e91cec7c3
parentb69e1afc67d758c5be6371d691568662ff9dfe5d (diff)
downloadchromium_src-97f973c80b84b13e9df161ed3fa1874217fb25a1.zip
chromium_src-97f973c80b84b13e9df161ed3fa1874217fb25a1.tar.gz
chromium_src-97f973c80b84b13e9df161ed3fa1874217fb25a1.tar.bz2
Unit tests fix
On Mac, we allocate TransportDIBs from the browser so the unit test which tests tranport DIB allocation will never work. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10073 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/render_process_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/renderer/render_process_unittest.cc b/chrome/renderer/render_process_unittest.cc
index 7b7b7c6..4f77d5d 100644
--- a/chrome/renderer/render_process_unittest.cc
+++ b/chrome/renderer/render_process_unittest.cc
@@ -26,6 +26,8 @@ class RenderProcessTest : public testing::Test {
TEST_F(RenderProcessTest, TestTransportDIBAllocation) {
+ // On Mac, we allocate in the browser so this test is invalid.
+#if !defined(OS_MACOSX)
const gfx::Rect rect(0, 0, 100, 100);
TransportDIB* dib;
skia::PlatformCanvas* canvas = RenderProcess::GetDrawingCanvas(&dib, rect);
@@ -33,6 +35,7 @@ TEST_F(RenderProcessTest, TestTransportDIBAllocation) {
ASSERT_TRUE(canvas);
RenderProcess::ReleaseTransportDIB(dib);
delete canvas;
+#endif
}
} // namespace