Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/trees/layer_tree_host_unittest_context.cc

Index: trunk/src/cc/trees/layer_tree_host_unittest_context.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host_unittest_context.cc	(revision 191412)
+++ trunk/src/cc/trees/layer_tree_host_unittest_context.cc	(working copy)
@@ -213,8 +213,8 @@
   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 @@
   }
 
   virtual void AfterTest() OVERRIDE {
-    EXPECT_EQ(10u, test_case_);
+    EXPECT_EQ(10, test_case_);
     EXPECT_EQ(8 + 10 + 10, num_losses_);
   }
 
@@ -1203,14 +1203,14 @@
         // First (regular) update, we should upload 2 resources (thumb, and
         // backtrack).
         EXPECT_EQ(1, scrollbar_layer_->update_count());
-        EXPECT_EQ(2u, upload_count);
+        EXPECT_EQ(2, 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(2u, upload_count);
+        EXPECT_EQ(2, upload_count);
         EndTest();
         break;
       default:
Property changes on: trunk/src/cc/trees/layer_tree_host_unittest_context.cc
___________________________________________________________________
Added: svn:mergeinfo