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

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« no previous file with comments | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | cc/trees/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index b1e3205798ef9d38bc4e266a9c71b94032a30bd2..6b95121ac7ee304f513f6f4af07130f18b9c0fe1 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -213,8 +213,8 @@ class LayerTreeHostContextTest : public LayerTreeTest {
int times_to_lose_on_create_;
int times_to_lose_during_commit_;
int times_to_lose_during_draw_;
- int times_to_fail_reinitialize_;
int times_to_fail_recreate_;
+ int times_to_fail_reinitialize_;
int times_to_lose_on_recreate_;
int times_to_fail_create_offscreen_;
int times_to_fail_recreate_offscreen_;
@@ -247,7 +247,7 @@ class LayerTreeHostContextTestLostContextSucceeds
}
virtual void AfterTest() OVERRIDE {
- EXPECT_EQ(10, test_case_);
+ EXPECT_EQ(10u, test_case_);
EXPECT_EQ(8 + 10 + 10, num_losses_);
}
@@ -1203,14 +1203,14 @@ class ScrollbarLayerLostContext : public LayerTreeHostContextTest {
// First (regular) update, we should upload 2 resources (thumb, and
// backtrack).
EXPECT_EQ(1, scrollbar_layer_->update_count());
- EXPECT_EQ(2, upload_count);
+ EXPECT_EQ(2u, upload_count);
LoseContext();
break;
case 2:
// Second update, after the lost context, we should still upload 2
// resources even if the contents haven't changed.
EXPECT_EQ(2, scrollbar_layer_->update_count());
- EXPECT_EQ(2, upload_count);
+ EXPECT_EQ(2u, upload_count);
EndTest();
break;
default:
« no previous file with comments | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | cc/trees/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698