ui: Allow individual test suites to opt-out of the TestCompositor.

ui/gl/gl_surface.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GL_GL_SURFACE_H_
 #define UI_GL_GL_SURFACE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 57 matching lines @@
   virtual unsigned int GetBackingFrameBufferObject();
 
   // Copy part of the backbuffer to the frontbuffer.
   virtual bool PostSubBuffer(int x, int y, int width, int height);
 
   // Initialize GL bindings.
   static bool InitializeOneOff();
 
   // Unit tests should call these instead of InitializeOneOff() to set up
   // GL bindings appropriate for tests.
-  static void InitializeOneOffForTests();
+  static void InitializeOneOffForTests(bool disable_drawing = false);

[no sievers, 2014/02/21 19:51:49]

I thought the default param was against the style guide.

[danakj, 2014/02/21 19:56:58]

Ya kinda. But it's just for a bit, in test suites I'll
InitializeOneOffForTests(true) to opt them in. Once everyone is (true) I can
remove the argument.

The alternative is add another method InitializeOneOffForTestsWithNullContexts,
and then go back and delete the method. I was trying to keep the churn down for
a temporary hack for our tests, but it's going to hit all the same lines of code
either way. But makes more more churn here in gl_surface, as I would have to
split this method up and have both methods call a 3rd internal method which then
just calls a 4th internal method. Meh, defer to your judgement on it :)

[Ken Russell (switch to Gerrit), 2014/02/21 20:03:37]

It's fine as a temporary workaround, but please add a TODO about removing it.

[danakj, 2014/02/21 20:20:54]

Thanks, good plan. Done!

   static void InitializeOneOffWithMockBindingsForTests();
   static void InitializeDynamicMockBindingsForTests(GLContext* context);
 
   // Called after a context is made current with this surface. Returns false
   // on error.
   virtual bool OnMakeCurrent(GLContext* context);
 
   // Used for explicit buffer management.
   virtual bool SetBackbufferAllocation(bool allocated);
   virtual void SetFrontbufferAllocation(bool allocated);
@@ skipping 78 matching lines @@
 
  private:
   scoped_refptr<GLSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_SURFACE_H_