cc: Lock resources directly in CALayerOverlay

cc/output/overlay_processor.h

Index: cc/output/overlay_processor.h
diff --git a/cc/output/overlay_processor.h b/cc/output/overlay_processor.h
index 01c28d253174aca976d65bff43138477b5146c4b..4fdcdcfb8002c264faa83bde8fd2eefbd2199e91 100644
--- a/cc/output/overlay_processor.h
+++ b/cc/output/overlay_processor.h
@@ -9,14 +9,17 @@
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
-#include "cc/output/ca_layer_overlay.h"
-#include "cc/output/overlay_candidate.h"
 #include "cc/quads/render_pass.h"
 
 namespace cc {
+class CALayerOverlay;
 class OutputSurface;
+class OverlayCandidate;
 class ResourceProvider;
 
+typedef std::vector<CALayerOverlay> CALayerOverlayList;
+typedef std::vector<OverlayCandidate> OverlayCandidateList;
+
 class CC_EXPORT OverlayProcessor {
  public:
   class CC_EXPORT Strategy {