Revert of Separate out resource mailbox creation and fix synchronization issue.

cc/resources/resource_provider_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2484 matching lines @@
   TransferableResourceArray list;
   child_resource_provider_->PrepareSendToParent(resource_ids_to_transfer,
                                                 &list);
 
   EXPECT_FALSE(release_sync_token.HasData());
   EXPECT_FALSE(lost_resource);
 
   child_resource_provider_ = nullptr;
 
   // Since the resource is in the parent, the child considers it lost.
+  EXPECT_FALSE(release_sync_token.HasData());
   EXPECT_TRUE(lost_resource);
 }
 
 TEST_P(ResourceProviderTest, LostContext) {
   // TextureMailbox callbacks only exist for GL textures for now.
   if (GetParam() != ResourceProvider::RESOURCE_TYPE_GL_TEXTURE)
     return;
   unsigned texture = context()->createTexture();
   context()->bindTexture(GL_TEXTURE_2D, texture);
   gpu::Mailbox mailbox;
@@ skipping 1097 matching lines @@
   EXPECT_TRUE(resource_provider_->CanLockForWrite(id));
   EXPECT_FALSE(resource_provider_->InUseByConsumer(id));
   gpu_memory_buffer_manager_->SetGpuMemoryBufferIsInUseByMacOSWindowServer(
       gpu_memory_buffer, true);
   EXPECT_FALSE(resource_provider_->CanLockForWrite(id));
   EXPECT_TRUE(resource_provider_->InUseByConsumer(id));
 }
 
 }  // namespace
 }  // namespace cc