Unified OutputSurface::SwapBuffers.

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index b9fb860db5a8e16c9c569b39f8d36050baec4ab0..1e118d4cee221c8288149a3cc2a42977eee7ce1f 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -149,16 +149,10 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
       settings.top_controls_height = controls_height;
   }
 
-  settings.compositor_frame_message =
-      cmd->HasSwitch(cc::switches::kEnableCompositorFrameMessage) ||
-      cmd->HasSwitch(cc::switches::kCompositeToMailbox) ||
-      cmd->HasSwitch(switches::kEnableSoftwareCompositingGLAdapter);
-
   if (settings.calculate_top_controls_position &&
-      (settings.top_controls_height <= 0 ||
-       !settings.compositor_frame_message)) {
-    DCHECK(false) << "Top controls repositioning enabled without valid height "
-                     "or compositor_frame_message set.";
+      settings.top_controls_height <= 0) {
+    DCHECK(false)
+        << "Top controls repositioning enabled without valid height set.";
     settings.calculate_top_controls_position = false;
   }