Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

 // Copyright 2014 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 "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 148 matching lines @@
 SynchronousCompositorFactoryImpl::~SynchronousCompositorFactoryImpl() {}
 
 scoped_refptr<base::SingleThreadTaskRunner>
 SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI);
 }
 
 scoped_ptr<cc::OutputSurface>
 SynchronousCompositorFactoryImpl::CreateOutputSurface(
     int routing_id,
-    int surface_id,
     scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) {
+  // TODO(piman): we still need to create a View command buffer until
+  // crbug.com/526196 is fixed. The surface_id doesn't matter, it just needs to
+  // be !0.
+  const int32 kDummySurfaceId = 1;
   scoped_refptr<cc::ContextProvider> onscreen_context =
-      CreateContextProviderForCompositor(surface_id, RENDER_COMPOSITOR_CONTEXT);
+      CreateContextProviderForCompositor(kDummySurfaceId,
+                                         RENDER_COMPOSITOR_CONTEXT);
   scoped_refptr<cc::ContextProvider> worker_context =
       GetSharedWorkerContextProvider();
   return make_scoped_ptr(new SynchronousCompositorOutputSurface(
       onscreen_context, worker_context, routing_id, frame_swap_message_queue));
 }
 
 InputHandlerManagerClient*
 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() {
   return synchronous_input_event_filter();
 }
@@ skipping 223 matching lines @@
         android_view_service_->sync_point_manager());
   }
   return gpu_thread_service_;
 }
 
 void SynchronousCompositorFactoryImpl::SetUseIpcCommandBuffer() {
   use_ipc_command_buffer_ = true;
 }
 
 }  // namespace content