Revert 118789 - Always use webkit compositor

ui/gfx/compositor/compositor_setup.h

Index: ui/gfx/compositor/compositor_setup.h
===================================================================
--- ui/gfx/compositor/compositor_setup.h	(revision 118791)
+++ ui/gfx/compositor/compositor_setup.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -15,8 +15,7 @@
 #if !defined(VIEWS_COMPOSITOR)
 // To centralize the ifdef to this file we define the function as doing nothing
 // on all platforms that don't use a compositor.
-COMPOSITOR_EXPORT inline void SetupTestCompositor() {}
-COMPOSITOR_EXPORT inline void DisableTestCompositor() {}
+COMPOSITOR_EXPORT void SetupTestCompositor() {}
 #else
 COMPOSITOR_EXPORT void SetupTestCompositor();