Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
index 5d62030cea0395d92a98d87385a896db022f0743..7048000101030361069186790caf54857e004757 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -166,10 +166,14 @@ SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() {
 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(