Move SynchronousCompositor into content/browser

content/browser/android/in_process/synchronous_compositor_output_surface.h

Index: content/browser/android/in_process/synchronous_compositor_output_surface.h
diff --git a/content/renderer/android/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h
similarity index 86%
rename from content/renderer/android/synchronous_compositor_output_surface.h
rename to content/browser/android/in_process/synchronous_compositor_output_surface.h
index f5eac6f8425ca91cd46ab0edebdfacdd29b7ed29..82becbcf0e7e1d2e2689c52286e61f63ad21ee83 100644
--- a/content/renderer/android/synchronous_compositor_output_surface.h
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
-#define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
+#ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -20,7 +20,6 @@ class WebGraphicsContext3DCommandBufferImpl;
 class SynchronousCompositorOutputSurfaceDelegate {
  public:
   virtual void SetContinuousInvalidate(bool enable) = 0;
-  virtual void DidCreateSynchronousOutputSurface() = 0;
   virtual void DidDestroySynchronousOutputSurface() = 0;
 
  protected:
@@ -42,10 +41,14 @@ class SynchronousCompositorOutputSurfaceDelegate {
 class SynchronousCompositorOutputSurface
     : NON_EXPORTED_BASE(public cc::OutputSurface) {
  public:
-  explicit SynchronousCompositorOutputSurface(
-      SynchronousCompositorOutputSurfaceDelegate* delegate);
+  explicit SynchronousCompositorOutputSurface(int routing_id);
   virtual ~SynchronousCompositorOutputSurface();
 
+  void SetDelegate(
+      SynchronousCompositorOutputSurfaceDelegate* delegate) {
+    delegate_ = delegate;
+  }
+
   // OutputSurface.
   virtual bool ForcedDrawToSoftwareDevice() const OVERRIDE;
   virtual bool BindToClient(cc::OutputSurfaceClient* surface_client) OVERRIDE;
@@ -70,6 +73,7 @@ class SynchronousCompositorOutputSurface
   void NotifyCompositorSettingsChanged();
   bool CalledOnValidThread() const;
 
+  int routing_id;
   SynchronousCompositorOutputSurfaceDelegate* delegate_;
   bool needs_begin_frame_;
   bool did_swap_buffer_;
@@ -82,4 +86,4 @@ class SynchronousCompositorOutputSurface
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_
+#endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_OUTPUT_SURFACE_H_