Remove more GpuMemoryBufferId plumbing

cc/resources/resource_provider.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 357 matching lines @@
 
   // In the case of context lost, this sync token may be empty (see comment in
   // the UpdateSyncToken() function). The WaitSyncTokenCHROMIUM() function
   // handles empty sync tokens properly so just wait anyways and update the
   // state the synchronized.
   gl->WaitSyncTokenCHROMIUM(mailbox_.sync_token().GetConstData());
   SetSynchronized();
 }
 
 ResourceProvider::Child::Child()
-    : gpu_memory_buffer_client_id(-1),
-      marked_for_deletion(false),
-      needs_sync_tokens(true) {}
+    : marked_for_deletion(false), needs_sync_tokens(true) {}
 
 ResourceProvider::Child::Child(const Child& other) = default;
 
 ResourceProvider::Child::~Child() {}
 
 ResourceProvider::ResourceProvider(
     ContextProvider* compositor_context_provider,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     BlockingTaskRunner* blocking_main_thread_task_runner,
@@ skipping 885 matching lines @@
 
 void ResourceProvider::SynchronousFence::Wait() {
   HasPassed();
 }
 
 void ResourceProvider::SynchronousFence::Synchronize() {
   TRACE_EVENT0("cc", "ResourceProvider::SynchronousFence::Synchronize");
   gl_->Finish();
 }
 
-int ResourceProvider::CreateChild(const ReturnCallback& return_callback,
-                                  int gpu_memory_buffer_client_id) {
+int ResourceProvider::CreateChild(const ReturnCallback& return_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Child child_info;
   child_info.return_callback = return_callback;
-  child_info.gpu_memory_buffer_client_id = gpu_memory_buffer_client_id;
 
   int child = next_child_++;
   children_[child] = child_info;
   return child;
 }
 
 void ResourceProvider::SetChildNeedsSyncTokens(int child_id, bool needs) {
   ChildMap::iterator it = children_.find(child_id);
   DCHECK(it != children_.end());
   it->second.needs_sync_tokens = needs;
@@ skipping 674 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc