Move synchronous compositor into content/browser

content/content_renderer.gypi

 # 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.
 
 {
   'dependencies': [
     '../jingle/jingle.gyp:jingle_glue',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ skipping 13 matching lines @@
     '../webkit/support/webkit_support.gyp:plugins',
     '../webkit/support/webkit_support.gyp:plugins_common',
     '../webkit/support/webkit_support.gyp:webkit_media',
   ],
   'include_dirs': [
     '..',
   ],
   'sources': [
     'public/renderer/android_content_detection_prefixes.cc',
     'public/renderer/android_content_detection_prefixes.h',
-    'public/renderer/android/synchronous_compositor_client.h',
-    'public/renderer/android/synchronous_compositor.h',
+    'public/browser/android/synchronous_compositor_client.h',
+    'public/browser/android/synchronous_compositor.h',

[jamesr, 2013/05/30 20:28:57]

this is weird - why do you need these header files in the gyp target for
content_renderer? headers in a gyp file don't have any impact on the compiled
target so i'd strongly prefer not doing this and only listing these headers in
content_browser.gypi

[joth, 2013/05/30 21:22:14]

Good spot, many thanks. 
Yes this was misuse of the tools/git/move_source_file.py tool (I fixed it on the
first round of file moves but forgot on the second)

     'public/renderer/content_renderer_client.cc',
     'public/renderer/content_renderer_client.h',
     'public/renderer/context_menu_client.h',
     'public/renderer/document_state.cc',
     'public/renderer/document_state.h',
     'public/renderer/history_item_serialization.cc',
     'public/renderer/history_item_serialization.h',
     'public/renderer/navigation_state.cc',
     'public/renderer/navigation_state.h',
     'public/renderer/password_form_conversion_utils.h',
@@ skipping 21 matching lines @@
     'renderer/all_rendering_benchmarks.cc',
     'renderer/all_rendering_benchmarks.h',
     'renderer/android/address_detector.cc',
     'renderer/android/address_detector.h',
     'renderer/android/content_detector.cc',
     'renderer/android/content_detector.h',
     'renderer/android/email_detector.cc',
     'renderer/android/email_detector.h',
     'renderer/android/phone_number_detector.cc',
     'renderer/android/phone_number_detector.h',
-    'renderer/android/synchronous_compositor_impl.cc',
-    'renderer/android/synchronous_compositor_impl.h',
-    'renderer/android/synchronous_compositor_output_surface.cc',
-    'renderer/android/synchronous_compositor_output_surface.h',
+    'renderer/android/synchronous_compositor_factory.cc',
+    'renderer/android/synchronous_compositor_factory.h',
     'renderer/device_orientation_dispatcher.cc',
     'renderer/device_orientation_dispatcher.h',
     'renderer/devtools/devtools_agent.cc',
     'renderer/devtools/devtools_agent.h',
     'renderer/devtools/devtools_agent_filter.cc',
     'renderer/devtools/devtools_agent_filter.h',
     'renderer/devtools/devtools_client.cc',
     'renderer/devtools/devtools_client.h',
     'renderer/disambiguation_popup_helper.cc',
     'renderer/disambiguation_popup_helper.h',
@@ skipping 389 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }