BrowserCompositorMac, ResizeLock, DelegatedFrameHost => content/browser/renderer_host

content/browser/renderer_host/delegated_frame_host.h

Index: content/browser/renderer_host/delegated_frame_host.h
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h
similarity index 97%
rename from content/browser/compositor/delegated_frame_host.h
rename to content/browser/renderer_host/delegated_frame_host.h
index e2f7ee5fa86f5a817614c92a5d373b654a6f706d..9f2b1813accfc8aa4926a0ce6e81317bc0f5eec3 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/renderer_host/delegated_frame_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
-#define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
+#define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 
 #include <stdint.h>
 
@@ -304,7 +304,7 @@ class CONTENT_EXPORT DelegatedFrameHost
 
   // Subscriber that listens to frame presentation events.
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
-  std::vector<scoped_refptr<OwnedMailbox> > idle_frame_subscriber_textures_;
+  std::vector<scoped_refptr<OwnedMailbox>> idle_frame_subscriber_textures_;
 
   // Callback used to pass the output request to the layer or to a function
   // specified by a test.
@@ -312,8 +312,7 @@ class CONTENT_EXPORT DelegatedFrameHost
       request_copy_of_output_callback_for_testing_;
 
   // YUV readback pipeline.
-  scoped_ptr<content::ReadbackYUVInterface>
-      yuv_readback_pipeline_;
+  scoped_ptr<content::ReadbackYUVInterface> yuv_readback_pipeline_;
 
   scoped_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
 
@@ -322,4 +321,4 @@ class CONTENT_EXPORT DelegatedFrameHost
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_