summaryrefslogtreecommitdiffstats
path: root/cc/resources/scoped_resource_unittest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 19:17:34 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 19:17:34 +0000
commit3209161d2f32bf14d594e455402be6d5ca09580b (patch)
treee4161d1d9a6c80e8c9e8d44c621136a812717ad2 /cc/resources/scoped_resource_unittest.cc
parent62d0c7fde4da7d8ebd6880cdfbb4aa166a67bcf0 (diff)
downloadchromium_src-3209161d2f32bf14d594e455402be6d5ca09580b.zip
chromium_src-3209161d2f32bf14d594e455402be6d5ca09580b.tar.gz
chromium_src-3209161d2f32bf14d594e455402be6d5ca09580b.tar.bz2
cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
The flag flip will be a follow up once ChromeOS build is sorted out. Review URL: https://codereview.chromium.org/13206004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources/scoped_resource_unittest.cc')
-rw-r--r--cc/resources/scoped_resource_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/resources/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc
index a9a087e..97e93d2 100644
--- a/cc/resources/scoped_resource_unittest.cc
+++ b/cc/resources/scoped_resource_unittest.cc
@@ -42,7 +42,7 @@ TEST(ScopedResourceTest, CreateScopedResource) {
EXPECT_EQ(expected_bytes, texture->bytes());
EXPECT_LT(0u, texture->id());
- EXPECT_EQ(GL_RGBA, texture->format());
+ EXPECT_EQ(static_cast<unsigned>(GL_RGBA), texture->format());
EXPECT_EQ(gfx::Size(30, 30), texture->size());
}