Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3526)

Unified Diff: chrome/browser/printing/units_unittest.cc

Issue 3149: Porting changes in chrome/{browser,common}, also enabling more unit tests.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/printing/units_unittest.cc
===================================================================
--- chrome/browser/printing/units_unittest.cc (revision 2402)
+++ chrome/browser/printing/units_unittest.cc (working copy)
@@ -32,8 +32,10 @@
EXPECT_EQ(-11, ConvertUnit(-1050, 1000, 10));
EXPECT_EQ(0, ConvertUnit(2, 1000000000, 1));
- EXPECT_EQ(2000000000, ConvertUnit(2, 1, 1000000000));
- EXPECT_EQ(4000000000, ConvertUnit(2, 1, 2000000000));
+ EXPECT_EQ(2000000000U,
+ static_cast<unsigned int>(ConvertUnit(2, 1, 1000000000)));
+ EXPECT_EQ(4000000000U,
+ static_cast<unsigned int>(ConvertUnit(2, 1, 2000000000)));
EXPECT_EQ(100, ConvertUnitDouble(100, 100, 100));
EXPECT_EQ(-100, ConvertUnitDouble(-100, 100, 100));

Powered by Google App Engine
This is Rietveld 408576698