Merge 193302 "Force GPU switch with CGLSetVirtualScreen only for..."

gpu/command_buffer/service/framebuffer_manager.h

Index: gpu/command_buffer/service/framebuffer_manager.h
===================================================================
--- gpu/command_buffer/service/framebuffer_manager.h	(revision 194412)
+++ gpu/command_buffer/service/framebuffer_manager.h	(working copy)
@@ -121,6 +121,10 @@
 
   static void ClearFramebufferCompleteComboMap();
 
+  static bool AllowFramebufferComboCompleteMapForTesting() {
+    return allow_framebuffer_combo_complete_map_;
+  }
+
  private:
   friend class FramebufferManager;
   friend class base::RefCounted<Framebuffer>;
@@ -164,6 +168,7 @@
   // it should be FRAMEBUFFER_COMPLETE.
   typedef base::hash_map<std::string, bool> FramebufferComboCompleteMap;
   static FramebufferComboCompleteMap* framebuffer_combo_complete_map_;
+  static bool allow_framebuffer_combo_complete_map_;
 
   scoped_array<GLenum> draw_buffers_;