Remove COMPOSITOR_2 flag, old compositor code.

ui/gfx/compositor/compositor.h

Index: ui/gfx/compositor/compositor.h
diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h
index 12b2e682f071b8da44e96a406da73f15142cdb18..2c71b4aeadb408cd9858e5f0f38b568452eba5b4 100644
--- a/ui/gfx/compositor/compositor.h
+++ b/ui/gfx/compositor/compositor.h
@@ -19,47 +19,6 @@ class Size;
 namespace ui {
 class Transform;
 
-#if !defined(COMPOSITOR_2)
-typedef unsigned int TextureID;
-
-// NOTE: all coordinates passed to Texture/Compositor have 0x0 as the upper left
-// corner.
-
-// Compositor object to take care of GPU painting.
-// A Browser compositor object is responsible for generating the final
-// displayable form of pixels comprising a single widget's contents. It draws an
-// appropriately transformed texture for each transformed view in the widget's
-// view hierarchy. The initial implementation uses GL for this purpose.
-// Future CLs will adapt this to ongoing Skia development.
-class Compositor : public base::RefCounted<Compositor> {
- public:
-  // Create a compositor from the provided handle.
-  static Compositor* Create(gfx::AcceleratedWidget widget);
-
-  // Notifies the compositor that compositing is about to start.
-  virtual void NotifyStart() = 0;
-
-  // Notifies the compositor that compositing is complete.
-  virtual void NotifyEnd() = 0;
-
-  // Draws the given texture with the given transform.
-  virtual void DrawTextureWithTransform(TextureID txt,
-                                        const ui::Transform& transform) = 0;
-
-  // Save the current transformation that can be restored with RestoreTransform.
-  virtual void SaveTransform() = 0;
-
-  // Restore a previously saved transformation using SaveTransform.
-  virtual void RestoreTransform() = 0;
-
- protected:
-  virtual ~Compositor() {}
-
- private:
-  friend class base::RefCounted<Compositor>;
-};
-
-#else
 // Textures are created by a Compositor for managing an accelerated view.
 // Any time a View with a texture needs to redraw itself it invokes SetBitmap().
 // When the view is ready to be drawn Draw() is invoked.
@@ -111,7 +70,6 @@ class Compositor : public base::RefCounted<Compositor> {
   friend class base::RefCounted<Compositor>;
 };
 
-#endif  // COMPOSITOR_2
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_COMPOSITOR_H_