(not for commit) Simplified multi-threaded Ganesh with lock on Flush only.

cc/surfaces/surface_aggregator_unittest.cc

Index: cc/surfaces/surface_aggregator_unittest.cc
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index 1dff7ec2c22bce2cecdf0d7631a35d12737fe0a2..704f42b6bb249704bf1ecb2e7cd253e59e4f3002 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -1226,13 +1226,9 @@ class SurfaceAggregatorWithResourcesTest : public testing::Test {
     output_surface_->BindToClient(&output_surface_client_);
     shared_bitmap_manager_.reset(new TestSharedBitmapManager);
 
-    resource_provider_ = ResourceProvider::Create(output_surface_.get(),
-                                                  shared_bitmap_manager_.get(),
-                                                  NULL,
-                                                  NULL,
-                                                  0,
-                                                  false,
-                                                  1);
+    resource_provider_ = ResourceProvider::Create(
+        output_surface_.get(), shared_bitmap_manager_.get(), NULL, NULL, 0,
+        false, false, 1);
 
     aggregator_.reset(
         new SurfaceAggregator(&manager_, resource_provider_.get()));