fix indentation in content_*.gypi.

This is a whitespace-only change to clean up from the refactoring of a
couple weeks ago for the component build.

R=jam@chromium.org
BUG=90442
TEST=none

Review URL: http://codereview.chromium.org/8046015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102800 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 1071 insertions, 1079 deletions

diff --git a/content/content_app.gypi b/content/content_app.gypi
index 996df28..fe029a1 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -3,29 +3,28 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation
-      'include_dirs': [
-        '..',
-      ],
+  'include_dirs': [
+    '..',
+  ],
+  'dependencies': [
+    '../base/base.gyp:base',
+    '../base/base.gyp:base_i18n',
+    '../crypto/crypto.gyp:crypto',
+    '../ui/ui.gyp:ui',
+  ],
+  'sources': [
+    'app/content_main.cc',
+    'app/content_main.h',
+    'app/content_main_delegate.cc',
+    'app/content_main_delegate.h',
+    'app/startup_helper_win.cc',
+    'app/startup_helper_win.h',
+  ],
+  'conditions': [
+    ['OS=="win"', {
       'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../crypto/crypto.gyp:crypto',
-        '../ui/ui.gyp:ui',
-      ],
-      'sources': [
-        'app/content_main.cc',
-        'app/content_main.h',
-        'app/content_main_delegate.cc',
-        'app/content_main_delegate.h',
-        'app/startup_helper_win.cc',
-        'app/startup_helper_win.h',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
+        '../sandbox/sandbox.gyp:sandbox',
       ],
+    }],
+  ],
 }
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 9944747..7cf30ee 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -3,635 +3,634 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../crypto/crypto.gyp:crypto',
-        '../net/net.gyp:net',
-        '../net/net.gyp:http_server',
-        '../ppapi/ppapi_internal.gyp:ppapi_proxy',
-        '../skia/skia.gyp:skia',
-        '../third_party/flac/flac.gyp:libflac',
-        # TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
-        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '../third_party/speex/speex.gyp:libspeex',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../third_party/zlib/zlib.gyp:zlib',
-        '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
-        '../webkit/support/webkit_support.gyp:webkit_resources',
-        '../webkit/support/webkit_support.gyp:webkit_strings',
+  'dependencies': [
+    '../crypto/crypto.gyp:crypto',
+    '../net/net.gyp:net',
+    '../net/net.gyp:http_server',
+    '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+    '../skia/skia.gyp:skia',
+    '../third_party/flac/flac.gyp:libflac',
+    # TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
+    '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+    '../third_party/speex/speex.gyp:libspeex',
+    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '../third_party/zlib/zlib.gyp:zlib',
+    '../ui/ui.gyp:ui',
+    '../ui/ui.gyp:ui_resources',
+    '../webkit/support/webkit_support.gyp:webkit_resources',
+    '../webkit/support/webkit_support.gyp:webkit_strings',
+  ],
+  'include_dirs': [
+    '..',
+    '<(INTERMEDIATE_DIR)',
+  ],
+  'sources': [
+    'browser/accessibility/browser_accessibility.cc',
+    'browser/accessibility/browser_accessibility.h',
+    'browser/accessibility/browser_accessibility_cocoa.h',
+    'browser/accessibility/browser_accessibility_cocoa.mm',
+    'browser/accessibility/browser_accessibility_delegate_mac.h',
+    'browser/accessibility/browser_accessibility_mac.h',
+    'browser/accessibility/browser_accessibility_mac.mm',
+    'browser/accessibility/browser_accessibility_manager.cc',
+    'browser/accessibility/browser_accessibility_manager.h',
+    'browser/accessibility/browser_accessibility_manager_mac.h',
+    'browser/accessibility/browser_accessibility_manager_mac.mm',
+    'browser/accessibility/browser_accessibility_manager_win.cc',
+    'browser/accessibility/browser_accessibility_manager_win.h',
+    'browser/accessibility/browser_accessibility_state.cc',
+    'browser/accessibility/browser_accessibility_state.h',
+    'browser/accessibility/browser_accessibility_win.cc',
+    'browser/accessibility/browser_accessibility_win.h',
+    'browser/appcache/appcache_dispatcher_host.cc',
+    'browser/appcache/appcache_dispatcher_host.h',
+    'browser/appcache/appcache_frontend_proxy.cc',
+    'browser/appcache/appcache_frontend_proxy.h',
+    'browser/appcache/chrome_appcache_service.cc',
+    'browser/appcache/chrome_appcache_service.h',
+    'browser/browser_child_process_host.cc',
+    'browser/browser_child_process_host.h',
+    'browser/browser_context.h',
+    'browser/browser_main.cc',
+    'browser/browser_main.h',
+    'browser/browser_message_filter.cc',
+    'browser/browser_message_filter.h',
+    'browser/browser_process_sub_thread.cc',
+    'browser/browser_process_sub_thread.h',
+    'browser/browser_thread.cc',
+    'browser/browser_thread.h',
+    'browser/browser_url_handler.cc',
+    'browser/browser_url_handler.h',
+    'browser/browsing_instance.cc',
+    'browser/browsing_instance.h',
+    'browser/cancelable_request.cc',
+    'browser/cancelable_request.h',
+    'browser/cert_store.cc',
+    'browser/cert_store.h',
+    'browser/child_process_launcher.cc',
+    'browser/child_process_launcher.h',
+    'browser/child_process_security_policy.cc',
+    'browser/child_process_security_policy.h',
+    'browser/chrome_blob_storage_context.cc',
+    'browser/chrome_blob_storage_context.h',
+    'browser/clipboard_dispatcher.h',
+    'browser/clipboard_dispatcher_gtk.cc',
+    'browser/clipboard_dispatcher_mac.mm',
+    'browser/clipboard_dispatcher_win.cc',
+    'browser/content_browser_client.h',
+    'browser/cross_site_request_manager.cc',
+    'browser/cross_site_request_manager.h',
+    'browser/debugger/devtools_agent_host.cc',
+    'browser/debugger/devtools_agent_host.h',
+    'browser/debugger/devtools_client_host.cc',
+    'browser/debugger/devtools_client_host.h',
+    'browser/debugger/devtools_http_protocol_handler.cc',
+    'browser/debugger/devtools_http_protocol_handler.h',
+    'browser/debugger/devtools_manager.cc',
+    'browser/debugger/devtools_manager.h',
+    'browser/debugger/devtools_netlog_observer.cc',
+    'browser/debugger/devtools_netlog_observer.h',
+    'browser/debugger/render_view_devtools_agent_host.cc',
+    'browser/debugger/render_view_devtools_agent_host.h',
+    'browser/debugger/worker_devtools_manager.cc',
+    'browser/debugger/worker_devtools_manager.h',
+    'browser/debugger/worker_devtools_message_filter.cc',
+    'browser/debugger/worker_devtools_message_filter.h',
+    'browser/device_orientation/accelerometer_mac.cc',
+    'browser/device_orientation/accelerometer_mac.h',
+    'browser/device_orientation/data_fetcher.h',
+    'browser/device_orientation/message_filter.cc',
+    'browser/device_orientation/message_filter.h',
+    'browser/device_orientation/orientation.h',
+    'browser/device_orientation/provider.cc',
+    'browser/device_orientation/provider.h',
+    'browser/device_orientation/provider_impl.cc',
+    'browser/device_orientation/provider_impl.h',
+    'browser/disposition_utils.cc',
+    'browser/disposition_utils.h',
+    'browser/download/base_file.cc',
+    'browser/download/base_file.h',
+    'browser/download/download_create_info.cc',
+    'browser/download/download_create_info.h',
+    'browser/download/download_file.cc',
+    'browser/download/download_file.h',
+    'browser/download/download_file_manager.cc',
+    'browser/download/download_file_manager.h',
+    'browser/download/download_id.cc',
+    'browser/download/download_id.h',
+    'browser/download/download_item.cc',
+    'browser/download/download_item.h',
+    'browser/download/download_manager.cc',
+    'browser/download/download_manager.h',
+    'browser/download/download_manager_delegate.h',
+    'browser/download/download_persistent_store_info.cc',
+    'browser/download/download_persistent_store_info.h',
+    'browser/download/download_request_handle.cc',
+    'browser/download/download_request_handle.h',
+    'browser/download/download_resource_handler.cc',
+    'browser/download/download_resource_handler.h',
+    'browser/download/download_state_info.cc',
+    'browser/download/download_state_info.h',
+    'browser/download/download_stats.cc',
+    'browser/download/download_stats.h',
+    'browser/download/download_status_updater.cc',
+    'browser/download/download_status_updater.h',
+    'browser/download/download_status_updater_delegate.h',
+    'browser/download/download_types.cc',
+    'browser/download/download_types.h',
+    'browser/download/drag_download_file.cc',
+    'browser/download/drag_download_file.h',
+    'browser/download/drag_download_util.cc',
+    'browser/download/drag_download_util.h',
+    'browser/download/mhtml_generation_manager.cc',
+    'browser/download/mhtml_generation_manager.h',
+    'browser/download/save_file.cc',
+    'browser/download/save_file.h',
+    'browser/download/save_file_manager.cc',
+    'browser/download/save_file_manager.h',
+    'browser/download/save_file_resource_handler.cc',
+    'browser/download/save_file_resource_handler.h',
+    'browser/download/save_item.cc',
+    'browser/download/save_item.h',
+    'browser/download/save_package.cc',
+    'browser/download/save_package.h',
+    'browser/download/save_types.cc',
+    'browser/download/save_types.h',
+    'browser/file_metadata_mac.h',
+    'browser/file_metadata_mac.mm',
+    'browser/file_system/browser_file_system_helper.cc',
+    'browser/file_system/browser_file_system_helper.h',
+    'browser/file_system/file_system_dispatcher_host.cc',
+    'browser/file_system/file_system_dispatcher_host.h',
+    'browser/find_pasteboard.h',
+    'browser/find_pasteboard.mm',
+    'browser/font_list_async.cc',
+    'browser/font_list_async.h',
+    'browser/geolocation/access_token_store.cc',
+    'browser/geolocation/access_token_store.h',
+    'browser/geolocation/arbitrator_dependency_factory.cc',
+    'browser/geolocation/arbitrator_dependency_factory.h',
+    'browser/geolocation/core_location_data_provider_mac.h',
+    'browser/geolocation/core_location_data_provider_mac.mm',
+    'browser/geolocation/core_location_provider_mac.h',
+    'browser/geolocation/core_location_provider_mac.mm',
+    'browser/geolocation/device_data_provider.cc',
+    'browser/geolocation/device_data_provider.h',
+    'browser/geolocation/empty_device_data_provider.cc',
+    'browser/geolocation/empty_device_data_provider.h',
+    'browser/geolocation/geolocation_dispatcher_host.cc',
+    'browser/geolocation/geolocation_dispatcher_host.h',
+    'browser/geolocation/geolocation_observer.h',
+    'browser/geolocation/geolocation_permission_context.cc',
+    'browser/geolocation/geolocation_permission_context.h',
+    'browser/geolocation/geolocation_provider.cc',
+    'browser/geolocation/geolocation_provider.h',
+    'browser/geolocation/gps_location_provider_linux.cc',
+    'browser/geolocation/gps_location_provider_linux.h',
+    'browser/geolocation/libgps_2_38_wrapper_linux.cc',
+    'browser/geolocation/libgps_2_94_wrapper_linux.cc',
+    'browser/geolocation/libgps_wrapper_linux.cc',
+    'browser/geolocation/libgps_wrapper_linux.h',
+    'browser/geolocation/location_arbitrator.cc',
+    'browser/geolocation/location_arbitrator.h',
+    'browser/geolocation/location_provider.cc',
+    'browser/geolocation/location_provider.h',
+    'browser/geolocation/network_location_provider.cc',
+    'browser/geolocation/network_location_provider.h',
+    'browser/geolocation/network_location_request.cc',
+    'browser/geolocation/network_location_request.h',
+    'browser/geolocation/osx_wifi.h',
+    'browser/geolocation/wifi_data_provider_common.cc',
+    'browser/geolocation/wifi_data_provider_common.h',
+    'browser/geolocation/wifi_data_provider_common_win.cc',
+    'browser/geolocation/wifi_data_provider_common_win.h',
+    'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
+    'browser/geolocation/wifi_data_provider_linux.cc',
+    'browser/geolocation/wifi_data_provider_linux.h',
+    'browser/geolocation/wifi_data_provider_mac.cc',
+    'browser/geolocation/wifi_data_provider_mac.h',
+    'browser/geolocation/wifi_data_provider_win.cc',
+    'browser/geolocation/wifi_data_provider_win.h',
+    'browser/geolocation/win7_location_api_win.cc',
+    'browser/geolocation/win7_location_api_win.h',
+    'browser/geolocation/win7_location_provider_win.cc',
+    'browser/geolocation/win7_location_provider_win.h',
+    'browser/gpu/gpu_blacklist.cc',
+    'browser/gpu/gpu_blacklist.h',
+    'browser/gpu/gpu_data_manager.cc',
+    'browser/gpu/gpu_data_manager.h',
+    'browser/gpu/gpu_process_host.cc',
+    'browser/gpu/gpu_process_host.h',
+    'browser/gpu/gpu_process_host_ui_shim.cc',
+    'browser/gpu/gpu_process_host_ui_shim.h',
+    'browser/host_zoom_map.cc',
+    'browser/host_zoom_map.h',
+    'browser/in_process_webkit/browser_webkitplatformsupport_impl.cc',
+    'browser/in_process_webkit/browser_webkitplatformsupport_impl.h',
+    'browser/in_process_webkit/dom_storage_area.cc',
+    'browser/in_process_webkit/dom_storage_area.h',
+    'browser/in_process_webkit/dom_storage_context.cc',
+    'browser/in_process_webkit/dom_storage_context.h',
+    'browser/in_process_webkit/dom_storage_message_filter.cc',
+    'browser/in_process_webkit/dom_storage_message_filter.h',
+    'browser/in_process_webkit/dom_storage_namespace.cc',
+    'browser/in_process_webkit/dom_storage_namespace.h',
+    'browser/in_process_webkit/indexed_db_callbacks.cc',
+    'browser/in_process_webkit/indexed_db_callbacks.h',
+    'browser/in_process_webkit/indexed_db_context.cc',
+    'browser/in_process_webkit/indexed_db_context.h',
+    'browser/in_process_webkit/indexed_db_database_callbacks.cc',
+    'browser/in_process_webkit/indexed_db_database_callbacks.h',
+    'browser/in_process_webkit/indexed_db_dispatcher_host.cc',
+    'browser/in_process_webkit/indexed_db_dispatcher_host.h',
+    'browser/in_process_webkit/indexed_db_key_utility_client.cc',
+    'browser/in_process_webkit/indexed_db_key_utility_client.h',
+    'browser/in_process_webkit/indexed_db_quota_client.cc',
+    'browser/in_process_webkit/indexed_db_quota_client.h',
+    'browser/in_process_webkit/indexed_db_transaction_callbacks.cc',
+    'browser/in_process_webkit/indexed_db_transaction_callbacks.h',
+    'browser/in_process_webkit/session_storage_namespace.cc',
+    'browser/in_process_webkit/session_storage_namespace.h',
+    'browser/in_process_webkit/webkit_context.cc',
+    'browser/in_process_webkit/webkit_context.h',
+    'browser/in_process_webkit/webkit_thread.cc',
+    'browser/in_process_webkit/webkit_thread.h',
+    'browser/intents/intent_injector.cc',
+    'browser/intents/intent_injector.h',
+    'browser/javascript_dialogs.h',
+    'browser/load_from_memory_cache_details.cc',
+    'browser/load_from_memory_cache_details.h',
+    'browser/load_notification_details.h',
+    'browser/mach_broker_mac.cc',
+    'browser/mach_broker_mac.h',
+    'browser/mime_registry_message_filter.cc',
+    'browser/mime_registry_message_filter.h',
+    'browser/net/browser_online_state_observer.cc',
+    'browser/net/browser_online_state_observer.h',
+    # TODO:  These should be moved to test_support (see below), but
+    # are currently used by production code in automation_provider.cc.
+    'browser/net/url_request_failed_dns_job.cc',
+    'browser/net/url_request_failed_dns_job.h',
+    'browser/net/url_request_mock_http_job.cc',
+    'browser/net/url_request_mock_http_job.h',
+    'browser/net/url_request_slow_download_job.cc',
+    'browser/net/url_request_slow_download_job.h',
+    'browser/net/url_request_slow_http_job.cc',
+    'browser/net/url_request_slow_http_job.h',
+    'browser/power_save_blocker.h',
+    'browser/power_save_blocker_common.cc',
+    'browser/power_save_blocker_mac.cc',
+    'browser/power_save_blocker_stub.cc',
+    'browser/power_save_blocker_win.cc',
+    'browser/ppapi_plugin_process_host.cc',
+    'browser/ppapi_plugin_process_host.h',
+    'browser/ppapi_broker_process_host.cc',
+    'browser/ppapi_broker_process_host.h',
+    'browser/plugin_process_host.cc',
+    'browser/plugin_process_host.h',
+    'browser/plugin_process_host_mac.cc',
+    'browser/plugin_service.cc',
+    'browser/plugin_service.h',
+    'browser/plugin_service_filter.h',
+    'browser/quota_permission_context.h',
+    'browser/renderer_host/accelerated_surface_container_mac.cc',
+    'browser/renderer_host/accelerated_surface_container_mac.h',
+    'browser/renderer_host/accelerated_surface_container_manager_mac.cc',
+    'browser/renderer_host/accelerated_surface_container_manager_mac.h',
+    'browser/renderer_host/async_resource_handler.cc',
+    'browser/renderer_host/async_resource_handler.h',
+    'browser/renderer_host/backing_store.cc',
+    'browser/renderer_host/backing_store.h',
+    'browser/renderer_host/backing_store_mac.h',
+    'browser/renderer_host/backing_store_mac.mm',
+    'browser/renderer_host/backing_store_manager.cc',
+    'browser/renderer_host/backing_store_manager.h',
+    'browser/renderer_host/backing_store_skia.cc',
+    'browser/renderer_host/backing_store_skia.h',
+    'browser/renderer_host/backing_store_win.cc',
+    'browser/renderer_host/backing_store_win.h',
+    'browser/renderer_host/backing_store_x.cc',
+    'browser/renderer_host/backing_store_x.h',
+    'browser/renderer_host/blob_message_filter.cc',
+    'browser/renderer_host/blob_message_filter.h',
+    'browser/renderer_host/browser_render_process_host.cc',
+    'browser/renderer_host/browser_render_process_host.h',
+    'browser/renderer_host/buffered_resource_handler.cc',
+    'browser/renderer_host/buffered_resource_handler.h',
+    'browser/renderer_host/clipboard_message_filter.cc',
+    'browser/renderer_host/clipboard_message_filter.h',
+    'browser/renderer_host/clipboard_message_filter_mac.mm',
+    'browser/renderer_host/cross_site_resource_handler.cc',
+    'browser/renderer_host/cross_site_resource_handler.h',
+    'browser/renderer_host/database_message_filter.cc',
+    'browser/renderer_host/database_message_filter.h',
+    'browser/renderer_host/file_utilities_message_filter.cc',
+    'browser/renderer_host/file_utilities_message_filter.h',
+    'browser/renderer_host/global_request_id.h',
+    'browser/renderer_host/gpu_message_filter.cc',
+    'browser/renderer_host/gpu_message_filter.h',
+    'browser/renderer_host/gtk_im_context_wrapper.cc',
+    'browser/renderer_host/gtk_im_context_wrapper.h',
+    'browser/renderer_host/gtk_key_bindings_handler.cc',
+    'browser/renderer_host/gtk_key_bindings_handler.h',
+    'browser/renderer_host/gtk_window_utils.cc',
+    'browser/renderer_host/gtk_window_utils.h',
+    'browser/renderer_host/media/audio_common.cc',
+    'browser/renderer_host/media/audio_common.h',
+    'browser/renderer_host/media/audio_input_device_manager.cc',
+    'browser/renderer_host/media/audio_input_device_manager.h',
+    'browser/renderer_host/media/audio_input_device_manager_event_handler.h',
+    'browser/renderer_host/media/audio_input_renderer_host.cc',
+    'browser/renderer_host/media/audio_input_renderer_host.h',
+    'browser/renderer_host/media/audio_input_sync_writer.cc',
+    'browser/renderer_host/media/audio_input_sync_writer.h',
+    'browser/renderer_host/media/audio_renderer_host.cc',
+    'browser/renderer_host/media/audio_renderer_host.h',
+    'browser/renderer_host/media/audio_sync_reader.cc',
+    'browser/renderer_host/media/audio_sync_reader.h',
+    'browser/renderer_host/media/media_stream_device_settings.cc',
+    'browser/renderer_host/media/media_stream_device_settings.h',
+    'browser/renderer_host/media/media_stream_dispatcher_host.cc',
+    'browser/renderer_host/media/media_stream_dispatcher_host.h',
+    'browser/renderer_host/media/media_stream_manager.cc',
+    'browser/renderer_host/media/media_stream_manager.h',
+    'browser/renderer_host/media/media_stream_provider.h',
+    'browser/renderer_host/media/media_stream_requester.h',
+    'browser/renderer_host/media/media_stream_settings_requester.h',
+    'browser/renderer_host/media/video_capture_controller.cc',
+    'browser/renderer_host/media/video_capture_controller.h',
+    'browser/renderer_host/media/video_capture_controller_event_handler.cc',
+    'browser/renderer_host/media/video_capture_controller_event_handler.h',
+    'browser/renderer_host/media/video_capture_host.cc',
+    'browser/renderer_host/media/video_capture_host.h',
+    'browser/renderer_host/media/video_capture_manager.cc',
+    'browser/renderer_host/media/video_capture_manager.h',
+    'browser/renderer_host/pepper_file_message_filter.cc',
+    'browser/renderer_host/pepper_file_message_filter.h',
+    'browser/renderer_host/pepper_message_filter.cc',
+    'browser/renderer_host/pepper_message_filter.h',
+    'browser/renderer_host/quota_dispatcher_host.cc',
+    'browser/renderer_host/quota_dispatcher_host.h',
+    'browser/renderer_host/redirect_to_file_resource_handler.cc',
+    'browser/renderer_host/redirect_to_file_resource_handler.h',
+    'browser/renderer_host/render_message_filter.cc',
+    'browser/renderer_host/render_message_filter.h',
+    'browser/renderer_host/render_message_filter_aura.cc',
+    'browser/renderer_host/render_message_filter_win.cc',
+    'browser/renderer_host/render_process_host.cc',
+    'browser/renderer_host/render_process_host.h',
+    'browser/renderer_host/render_sandbox_host_linux.cc',
+    'browser/renderer_host/render_sandbox_host_linux.h',
+    'browser/renderer_host/render_view_host.cc',
+    'browser/renderer_host/render_view_host.h',
+    'browser/renderer_host/render_view_host_delegate.cc',
+    'browser/renderer_host/render_view_host_delegate.h',
+    'browser/renderer_host/render_view_host_factory.cc',
+    'browser/renderer_host/render_view_host_factory.h',
+    'browser/renderer_host/render_view_host_notification_task.h',
+    'browser/renderer_host/render_view_host_observer.cc',
+    'browser/renderer_host/render_view_host_observer.h',
+    'browser/renderer_host/render_widget_fullscreen_host.cc',
+    'browser/renderer_host/render_widget_fullscreen_host.h',
+    'browser/renderer_host/render_widget_helper.cc',
+    'browser/renderer_host/render_widget_helper.h',
+    'browser/renderer_host/render_widget_host.cc',
+    'browser/renderer_host/render_widget_host.h',
+    'browser/renderer_host/render_widget_host_gtk.cc',
+    'browser/renderer_host/render_widget_host_mac.cc',
+    'browser/renderer_host/render_widget_host_view.cc',
+    'browser/renderer_host/render_widget_host_view.h',
+    'browser/renderer_host/render_widget_host_view_gtk.cc',
+    'browser/renderer_host/render_widget_host_view_gtk.h',
+    'browser/renderer_host/render_widget_host_view_win.cc',
+    'browser/renderer_host/render_widget_host_view_win.h',
+    'browser/renderer_host/resource_dispatcher_host.cc',
+    'browser/renderer_host/resource_dispatcher_host.h',
+    'browser/renderer_host/resource_dispatcher_host_delegate.h',
+    'browser/renderer_host/resource_dispatcher_host_login_delegate.cc',
+    'browser/renderer_host/resource_dispatcher_host_login_delegate.h',
+    'browser/renderer_host/resource_dispatcher_host_request_info.cc',
+    'browser/renderer_host/resource_dispatcher_host_request_info.h',
+    'browser/renderer_host/resource_handler.h',
+    'browser/renderer_host/resource_message_filter.cc',
+    'browser/renderer_host/resource_message_filter.h',
+    'browser/renderer_host/resource_queue.cc',
+    'browser/renderer_host/resource_queue.h',
+    'browser/renderer_host/resource_request_details.cc',
+    'browser/renderer_host/resource_request_details.h',
+    'browser/renderer_host/socket_stream_dispatcher_host.cc',
+    'browser/renderer_host/socket_stream_dispatcher_host.h',
+    'browser/renderer_host/socket_stream_host.cc',
+    'browser/renderer_host/socket_stream_host.h',
+    'browser/renderer_host/sync_resource_handler.cc',
+    'browser/renderer_host/sync_resource_handler.h',
+    'browser/renderer_host/text_input_client_mac.h',
+    'browser/renderer_host/text_input_client_mac.mm',
+    'browser/renderer_host/text_input_client_message_filter.h',
+    'browser/renderer_host/text_input_client_message_filter.mm',
+    'browser/renderer_host/x509_user_cert_resource_handler.cc',
+    'browser/renderer_host/x509_user_cert_resource_handler.h',
+    'browser/resolve_proxy_msg_helper.cc',
+    'browser/resolve_proxy_msg_helper.h',
+    'browser/resource_context.cc',
+    'browser/resource_context.h',
+    'browser/safe_util_win.cc',
+    'browser/safe_util_win.h',
+    'browser/sensors/sensors_provider.cc',
+    'browser/sensors/sensors_provider.h',
+    'browser/sensors/sensors_provider_impl.cc',
+    'browser/sensors/sensors_provider_impl.h',
+    'browser/site_instance.cc',
+    'browser/site_instance.h',
+    'browser/speech/audio_encoder.cc',
+    'browser/speech/audio_encoder.h',
+    'browser/speech/endpointer/endpointer.cc',
+    'browser/speech/endpointer/endpointer.h',
+    'browser/speech/endpointer/energy_endpointer.cc',
+    'browser/speech/endpointer/energy_endpointer.h',
+    'browser/speech/endpointer/energy_endpointer_params.cc',
+    'browser/speech/endpointer/energy_endpointer_params.h',
+    'browser/speech/speech_input_dispatcher_host.cc',
+    'browser/speech/speech_input_dispatcher_host.h',
+    'browser/speech/speech_input_manager.cc',
+    'browser/speech/speech_input_manager.h',
+    'browser/speech/speech_recognition_request.cc',
+    'browser/speech/speech_recognition_request.h',
+    'browser/speech/speech_recognizer.cc',
+    'browser/speech/speech_recognizer.h',
+    'browser/ssl/ssl_cert_error_handler.cc',
+    'browser/ssl/ssl_cert_error_handler.h',
+    'browser/ssl/ssl_client_auth_handler.cc',
+    'browser/ssl/ssl_client_auth_handler.h',
+    'browser/ssl/ssl_client_auth_notification_details.cc',
+    'browser/ssl/ssl_client_auth_notification_details.h',
+    'browser/ssl/ssl_error_handler.cc',
+    'browser/ssl/ssl_error_handler.h',
+    'browser/ssl/ssl_host_state.cc',
+    'browser/ssl/ssl_host_state.h',
+    'browser/ssl/ssl_manager.cc',
+    'browser/ssl/ssl_manager.h',
+    'browser/ssl/ssl_policy.cc',
+    'browser/ssl/ssl_policy.h',
+    'browser/ssl/ssl_policy_backend.cc',
+    'browser/ssl/ssl_policy_backend.h',
+    'browser/ssl/ssl_request_info.cc',
+    'browser/ssl/ssl_request_info.h',
+    'browser/tab_contents/constrained_window.h',
+    'browser/tab_contents/interstitial_page.cc',
+    'browser/tab_contents/interstitial_page.h',
+    'browser/tab_contents/navigation_controller.cc',
+    'browser/tab_contents/navigation_controller.h',
+    'browser/tab_contents/navigation_details.cc',
+    'browser/tab_contents/navigation_details.h',
+    'browser/tab_contents/navigation_entry.cc',
+    'browser/tab_contents/navigation_entry.h',
+    'browser/tab_contents/page_navigator.cc',
+    'browser/tab_contents/page_navigator.h',
+    'browser/tab_contents/provisional_load_details.cc',
+    'browser/tab_contents/provisional_load_details.h',
+    'browser/tab_contents/render_view_host_manager.cc',
+    'browser/tab_contents/render_view_host_manager.h',
+    'browser/tab_contents/tab_contents.cc',
+    'browser/tab_contents/tab_contents.h',
+    'browser/tab_contents/tab_contents_delegate.cc',
+    'browser/tab_contents/tab_contents_delegate.h',
+    'browser/tab_contents/tab_contents_observer.cc',
+    'browser/tab_contents/tab_contents_observer.h',
+    'browser/tab_contents/tab_contents_view.cc',
+    'browser/tab_contents/tab_contents_view.h',
+    'browser/tab_contents/title_updated_details.h',
+    'browser/trace_controller.cc',
+    'browser/trace_controller.h',
+    'browser/trace_message_filter.cc',
+    'browser/trace_message_filter.h',
+    'browser/trace_subscriber_stdio.cc',
+    'browser/trace_subscriber_stdio.h',
+    'browser/user_metrics.cc',
+    'browser/user_metrics.h',
+    'browser/utility_process_host.cc',
+    'browser/utility_process_host.h',
+    'browser/webui/empty_web_ui_factory.cc',
+    'browser/webui/empty_web_ui_factory.h',
+    'browser/webui/generic_handler.cc',
+    'browser/webui/generic_handler.h',
+    'browser/webui/web_ui.cc',
+    'browser/webui/web_ui.h',
+    'browser/webui/web_ui_factory.cc',
+    'browser/webui/web_ui_factory.h',
+    'browser/worker_host/message_port_service.cc',
+    'browser/worker_host/message_port_service.h',
+    'browser/worker_host/worker_document_set.cc',
+    'browser/worker_host/worker_document_set.h',
+    'browser/worker_host/worker_message_filter.cc',
+    'browser/worker_host/worker_message_filter.h',
+    'browser/worker_host/worker_process_host.cc',
+    'browser/worker_host/worker_process_host.h',
+    'browser/worker_host/worker_service.cc',
+    'browser/worker_host/worker_service.h',
+    'browser/zygote_host_linux.cc',
+    'browser/zygote_host_linux.h',
+    'browser/zygote_main_linux.cc',
+  ],
+  'conditions': [
+    ['p2p_apis==1', {
+      'sources': [
+        'browser/renderer_host/p2p/socket_host.cc',
+        'browser/renderer_host/p2p/socket_host.h',
+        'browser/renderer_host/p2p/socket_host_tcp.cc',
+        'browser/renderer_host/p2p/socket_host_tcp.h',
+        'browser/renderer_host/p2p/socket_host_tcp_server.cc',
+        'browser/renderer_host/p2p/socket_host_tcp_server.h',
+        'browser/renderer_host/p2p/socket_host_udp.cc',
+        'browser/renderer_host/p2p/socket_host_udp.h',
+        'browser/renderer_host/p2p/socket_dispatcher_host.cc',
+        'browser/renderer_host/p2p/socket_dispatcher_host.h',
       ],
-      'include_dirs': [
-        '..',
-        '<(INTERMEDIATE_DIR)',
+    }],
+    ['OS=="win"', {
+      'dependencies': [
+        # For accessibility
+        '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
+        '../third_party/isimpledom/isimpledom.gyp:isimpledom',
       ],
-      'sources': [
-        'browser/accessibility/browser_accessibility.cc',
-        'browser/accessibility/browser_accessibility.h',
-        'browser/accessibility/browser_accessibility_cocoa.h',
-        'browser/accessibility/browser_accessibility_cocoa.mm',
-        'browser/accessibility/browser_accessibility_delegate_mac.h',
-        'browser/accessibility/browser_accessibility_mac.h',
-        'browser/accessibility/browser_accessibility_mac.mm',
-        'browser/accessibility/browser_accessibility_manager.cc',
-        'browser/accessibility/browser_accessibility_manager.h',
-        'browser/accessibility/browser_accessibility_manager_mac.h',
-        'browser/accessibility/browser_accessibility_manager_mac.mm',
-        'browser/accessibility/browser_accessibility_manager_win.cc',
-        'browser/accessibility/browser_accessibility_manager_win.h',
-        'browser/accessibility/browser_accessibility_state.cc',
-        'browser/accessibility/browser_accessibility_state.h',
-        'browser/accessibility/browser_accessibility_win.cc',
-        'browser/accessibility/browser_accessibility_win.h',
-        'browser/appcache/appcache_dispatcher_host.cc',
-        'browser/appcache/appcache_dispatcher_host.h',
-        'browser/appcache/appcache_frontend_proxy.cc',
-        'browser/appcache/appcache_frontend_proxy.h',
-        'browser/appcache/chrome_appcache_service.cc',
-        'browser/appcache/chrome_appcache_service.h',
-        'browser/browser_child_process_host.cc',
-        'browser/browser_child_process_host.h',
-        'browser/browser_context.h',
-        'browser/browser_main.cc',
-        'browser/browser_main.h',
-        'browser/browser_message_filter.cc',
-        'browser/browser_message_filter.h',
-        'browser/browser_process_sub_thread.cc',
-        'browser/browser_process_sub_thread.h',
-        'browser/browser_thread.cc',
-        'browser/browser_thread.h',
-        'browser/browser_url_handler.cc',
-        'browser/browser_url_handler.h',
-        'browser/browsing_instance.cc',
-        'browser/browsing_instance.h',
-        'browser/cancelable_request.cc',
-        'browser/cancelable_request.h',
-        'browser/cert_store.cc',
-        'browser/cert_store.h',
-        'browser/child_process_launcher.cc',
-        'browser/child_process_launcher.h',
-        'browser/child_process_security_policy.cc',
-        'browser/child_process_security_policy.h',
-        'browser/chrome_blob_storage_context.cc',
-        'browser/chrome_blob_storage_context.h',
-        'browser/clipboard_dispatcher.h',
-        'browser/clipboard_dispatcher_gtk.cc',
-        'browser/clipboard_dispatcher_mac.mm',
-        'browser/clipboard_dispatcher_win.cc',
-        'browser/content_browser_client.h',
-        'browser/cross_site_request_manager.cc',
-        'browser/cross_site_request_manager.h',
-        'browser/debugger/devtools_agent_host.cc',
-        'browser/debugger/devtools_agent_host.h',
-        'browser/debugger/devtools_client_host.cc',
-        'browser/debugger/devtools_client_host.h',
-        'browser/debugger/devtools_http_protocol_handler.cc',
-        'browser/debugger/devtools_http_protocol_handler.h',
-        'browser/debugger/devtools_manager.cc',
-        'browser/debugger/devtools_manager.h',
-        'browser/debugger/devtools_netlog_observer.cc',
-        'browser/debugger/devtools_netlog_observer.h',
-        'browser/debugger/render_view_devtools_agent_host.cc',
-        'browser/debugger/render_view_devtools_agent_host.h',
-        'browser/debugger/worker_devtools_manager.cc',
-        'browser/debugger/worker_devtools_manager.h',
-        'browser/debugger/worker_devtools_message_filter.cc',
-        'browser/debugger/worker_devtools_message_filter.h',
-        'browser/device_orientation/accelerometer_mac.cc',
-        'browser/device_orientation/accelerometer_mac.h',
-        'browser/device_orientation/data_fetcher.h',
-        'browser/device_orientation/message_filter.cc',
-        'browser/device_orientation/message_filter.h',
-        'browser/device_orientation/orientation.h',
-        'browser/device_orientation/provider.cc',
-        'browser/device_orientation/provider.h',
-        'browser/device_orientation/provider_impl.cc',
-        'browser/device_orientation/provider_impl.h',
-        'browser/disposition_utils.cc',
-        'browser/disposition_utils.h',
-        'browser/download/base_file.cc',
-        'browser/download/base_file.h',
-        'browser/download/download_create_info.cc',
-        'browser/download/download_create_info.h',
-        'browser/download/download_file.cc',
-        'browser/download/download_file.h',
-        'browser/download/download_file_manager.cc',
-        'browser/download/download_file_manager.h',
-        'browser/download/download_id.cc',
-        'browser/download/download_id.h',
-        'browser/download/download_item.cc',
-        'browser/download/download_item.h',
-        'browser/download/download_manager.cc',
-        'browser/download/download_manager.h',
-        'browser/download/download_manager_delegate.h',
-        'browser/download/download_persistent_store_info.cc',
-        'browser/download/download_persistent_store_info.h',
-        'browser/download/download_request_handle.cc',
-        'browser/download/download_request_handle.h',
-        'browser/download/download_resource_handler.cc',
-        'browser/download/download_resource_handler.h',
-        'browser/download/download_state_info.cc',
-        'browser/download/download_state_info.h',
-        'browser/download/download_stats.cc',
-        'browser/download/download_stats.h',
-        'browser/download/download_status_updater.cc',
-        'browser/download/download_status_updater.h',
-        'browser/download/download_status_updater_delegate.h',
-        'browser/download/download_types.cc',
-        'browser/download/download_types.h',
-        'browser/download/drag_download_file.cc',
-        'browser/download/drag_download_file.h',
-        'browser/download/drag_download_util.cc',
-        'browser/download/drag_download_util.h',
-        'browser/download/mhtml_generation_manager.cc',
-        'browser/download/mhtml_generation_manager.h',
-        'browser/download/save_file.cc',
-        'browser/download/save_file.h',
-        'browser/download/save_file_manager.cc',
-        'browser/download/save_file_manager.h',
-        'browser/download/save_file_resource_handler.cc',
-        'browser/download/save_file_resource_handler.h',
-        'browser/download/save_item.cc',
-        'browser/download/save_item.h',
-        'browser/download/save_package.cc',
-        'browser/download/save_package.h',
-        'browser/download/save_types.cc',
-        'browser/download/save_types.h',
-        'browser/file_metadata_mac.h',
-        'browser/file_metadata_mac.mm',
-        'browser/file_system/browser_file_system_helper.cc',
-        'browser/file_system/browser_file_system_helper.h',
-        'browser/file_system/file_system_dispatcher_host.cc',
-        'browser/file_system/file_system_dispatcher_host.h',
-        'browser/find_pasteboard.h',
-        'browser/find_pasteboard.mm',
-        'browser/font_list_async.cc',
-        'browser/font_list_async.h',
-        'browser/geolocation/access_token_store.cc',
-        'browser/geolocation/access_token_store.h',
-        'browser/geolocation/arbitrator_dependency_factory.cc',
-        'browser/geolocation/arbitrator_dependency_factory.h',
-        'browser/geolocation/core_location_data_provider_mac.h',
-        'browser/geolocation/core_location_data_provider_mac.mm',
-        'browser/geolocation/core_location_provider_mac.h',
-        'browser/geolocation/core_location_provider_mac.mm',
-        'browser/geolocation/device_data_provider.cc',
-        'browser/geolocation/device_data_provider.h',
-        'browser/geolocation/empty_device_data_provider.cc',
-        'browser/geolocation/empty_device_data_provider.h',
-        'browser/geolocation/geolocation_dispatcher_host.cc',
-        'browser/geolocation/geolocation_dispatcher_host.h',
-        'browser/geolocation/geolocation_observer.h',
-        'browser/geolocation/geolocation_permission_context.cc',
-        'browser/geolocation/geolocation_permission_context.h',
-        'browser/geolocation/geolocation_provider.cc',
-        'browser/geolocation/geolocation_provider.h',
-        'browser/geolocation/gps_location_provider_linux.cc',
-        'browser/geolocation/gps_location_provider_linux.h',
-        'browser/geolocation/libgps_2_38_wrapper_linux.cc',
-        'browser/geolocation/libgps_2_94_wrapper_linux.cc',
-        'browser/geolocation/libgps_wrapper_linux.cc',
-        'browser/geolocation/libgps_wrapper_linux.h',
-        'browser/geolocation/location_arbitrator.cc',
-        'browser/geolocation/location_arbitrator.h',
-        'browser/geolocation/location_provider.cc',
-        'browser/geolocation/location_provider.h',
-        'browser/geolocation/network_location_provider.cc',
-        'browser/geolocation/network_location_provider.h',
-        'browser/geolocation/network_location_request.cc',
-        'browser/geolocation/network_location_request.h',
-        'browser/geolocation/osx_wifi.h',
-        'browser/geolocation/wifi_data_provider_common.cc',
-        'browser/geolocation/wifi_data_provider_common.h',
-        'browser/geolocation/wifi_data_provider_common_win.cc',
-        'browser/geolocation/wifi_data_provider_common_win.h',
-        'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
-        'browser/geolocation/wifi_data_provider_linux.cc',
-        'browser/geolocation/wifi_data_provider_linux.h',
-        'browser/geolocation/wifi_data_provider_mac.cc',
-        'browser/geolocation/wifi_data_provider_mac.h',
-        'browser/geolocation/wifi_data_provider_win.cc',
-        'browser/geolocation/wifi_data_provider_win.h',
-        'browser/geolocation/win7_location_api_win.cc',
-        'browser/geolocation/win7_location_api_win.h',
-        'browser/geolocation/win7_location_provider_win.cc',
-        'browser/geolocation/win7_location_provider_win.h',
-        'browser/gpu/gpu_blacklist.cc',
-        'browser/gpu/gpu_blacklist.h',
-        'browser/gpu/gpu_data_manager.cc',
-        'browser/gpu/gpu_data_manager.h',
-        'browser/gpu/gpu_process_host.cc',
-        'browser/gpu/gpu_process_host.h',
-        'browser/gpu/gpu_process_host_ui_shim.cc',
-        'browser/gpu/gpu_process_host_ui_shim.h',
-        'browser/host_zoom_map.cc',
-        'browser/host_zoom_map.h',
-        'browser/in_process_webkit/browser_webkitplatformsupport_impl.cc',
-        'browser/in_process_webkit/browser_webkitplatformsupport_impl.h',
-        'browser/in_process_webkit/dom_storage_area.cc',
-        'browser/in_process_webkit/dom_storage_area.h',
-        'browser/in_process_webkit/dom_storage_context.cc',
-        'browser/in_process_webkit/dom_storage_context.h',
-        'browser/in_process_webkit/dom_storage_message_filter.cc',
-        'browser/in_process_webkit/dom_storage_message_filter.h',
-        'browser/in_process_webkit/dom_storage_namespace.cc',
-        'browser/in_process_webkit/dom_storage_namespace.h',
-        'browser/in_process_webkit/indexed_db_callbacks.cc',
-        'browser/in_process_webkit/indexed_db_callbacks.h',
-        'browser/in_process_webkit/indexed_db_context.cc',
-        'browser/in_process_webkit/indexed_db_context.h',
-        'browser/in_process_webkit/indexed_db_database_callbacks.cc',
-        'browser/in_process_webkit/indexed_db_database_callbacks.h',
-        'browser/in_process_webkit/indexed_db_dispatcher_host.cc',
-        'browser/in_process_webkit/indexed_db_dispatcher_host.h',
-        'browser/in_process_webkit/indexed_db_key_utility_client.cc',
-        'browser/in_process_webkit/indexed_db_key_utility_client.h',
-        'browser/in_process_webkit/indexed_db_quota_client.cc',
-        'browser/in_process_webkit/indexed_db_quota_client.h',
-        'browser/in_process_webkit/indexed_db_transaction_callbacks.cc',
-        'browser/in_process_webkit/indexed_db_transaction_callbacks.h',
-        'browser/in_process_webkit/session_storage_namespace.cc',
-        'browser/in_process_webkit/session_storage_namespace.h',
-        'browser/in_process_webkit/webkit_context.cc',
-        'browser/in_process_webkit/webkit_context.h',
-        'browser/in_process_webkit/webkit_thread.cc',
-        'browser/in_process_webkit/webkit_thread.h',
-        'browser/intents/intent_injector.cc',
-        'browser/intents/intent_injector.h',
-        'browser/javascript_dialogs.h',
-        'browser/load_from_memory_cache_details.cc',
-        'browser/load_from_memory_cache_details.h',
-        'browser/load_notification_details.h',
-        'browser/mach_broker_mac.cc',
-        'browser/mach_broker_mac.h',
-        'browser/mime_registry_message_filter.cc',
-        'browser/mime_registry_message_filter.h',
-        'browser/net/browser_online_state_observer.cc',
-        'browser/net/browser_online_state_observer.h',
-        # TODO:  These should be moved to test_support (see below), but
-        # are currently used by production code in automation_provider.cc.
-        'browser/net/url_request_failed_dns_job.cc',
-        'browser/net/url_request_failed_dns_job.h',
-        'browser/net/url_request_mock_http_job.cc',
-        'browser/net/url_request_mock_http_job.h',
-        'browser/net/url_request_slow_download_job.cc',
-        'browser/net/url_request_slow_download_job.h',
-        'browser/net/url_request_slow_http_job.cc',
-        'browser/net/url_request_slow_http_job.h',
-        'browser/power_save_blocker.h',
-        'browser/power_save_blocker_common.cc',
-        'browser/power_save_blocker_mac.cc',
+      'link_settings': {
+        'libraries': [
+          '-llocationapi.lib',
+          '-lsensorsapi.lib',
+        ],
+      },
+      'sources!': [
         'browser/power_save_blocker_stub.cc',
-        'browser/power_save_blocker_win.cc',
-        'browser/ppapi_plugin_process_host.cc',
-        'browser/ppapi_plugin_process_host.h',
-        'browser/ppapi_broker_process_host.cc',
-        'browser/ppapi_broker_process_host.h',
-        'browser/plugin_process_host.cc',
-        'browser/plugin_process_host.h',
-        'browser/plugin_process_host_mac.cc',
-        'browser/plugin_service.cc',
-        'browser/plugin_service.h',
-        'browser/plugin_service_filter.h',
-        'browser/quota_permission_context.h',
-        'browser/renderer_host/accelerated_surface_container_mac.cc',
-        'browser/renderer_host/accelerated_surface_container_mac.h',
-        'browser/renderer_host/accelerated_surface_container_manager_mac.cc',
-        'browser/renderer_host/accelerated_surface_container_manager_mac.h',
-        'browser/renderer_host/async_resource_handler.cc',
-        'browser/renderer_host/async_resource_handler.h',
-        'browser/renderer_host/backing_store.cc',
-        'browser/renderer_host/backing_store.h',
-        'browser/renderer_host/backing_store_mac.h',
-        'browser/renderer_host/backing_store_mac.mm',
-        'browser/renderer_host/backing_store_manager.cc',
-        'browser/renderer_host/backing_store_manager.h',
-        'browser/renderer_host/backing_store_skia.cc',
-        'browser/renderer_host/backing_store_skia.h',
-        'browser/renderer_host/backing_store_win.cc',
-        'browser/renderer_host/backing_store_win.h',
-        'browser/renderer_host/backing_store_x.cc',
-        'browser/renderer_host/backing_store_x.h',
-        'browser/renderer_host/blob_message_filter.cc',
-        'browser/renderer_host/blob_message_filter.h',
-        'browser/renderer_host/browser_render_process_host.cc',
-        'browser/renderer_host/browser_render_process_host.h',
-        'browser/renderer_host/buffered_resource_handler.cc',
-        'browser/renderer_host/buffered_resource_handler.h',
-        'browser/renderer_host/clipboard_message_filter.cc',
-        'browser/renderer_host/clipboard_message_filter.h',
-        'browser/renderer_host/clipboard_message_filter_mac.mm',
-        'browser/renderer_host/cross_site_resource_handler.cc',
-        'browser/renderer_host/cross_site_resource_handler.h',
-        'browser/renderer_host/database_message_filter.cc',
-        'browser/renderer_host/database_message_filter.h',
-        'browser/renderer_host/file_utilities_message_filter.cc',
-        'browser/renderer_host/file_utilities_message_filter.h',
-        'browser/renderer_host/global_request_id.h',
-        'browser/renderer_host/gpu_message_filter.cc',
-        'browser/renderer_host/gpu_message_filter.h',
-        'browser/renderer_host/gtk_im_context_wrapper.cc',
-        'browser/renderer_host/gtk_im_context_wrapper.h',
-        'browser/renderer_host/gtk_key_bindings_handler.cc',
-        'browser/renderer_host/gtk_key_bindings_handler.h',
-        'browser/renderer_host/gtk_window_utils.cc',
-        'browser/renderer_host/gtk_window_utils.h',
-        'browser/renderer_host/media/audio_common.cc',
-        'browser/renderer_host/media/audio_common.h',
-        'browser/renderer_host/media/audio_input_device_manager.cc',
-        'browser/renderer_host/media/audio_input_device_manager.h',
-        'browser/renderer_host/media/audio_input_device_manager_event_handler.h',
-        'browser/renderer_host/media/audio_input_renderer_host.cc',
-        'browser/renderer_host/media/audio_input_renderer_host.h',
-        'browser/renderer_host/media/audio_input_sync_writer.cc',
-        'browser/renderer_host/media/audio_input_sync_writer.h',
-        'browser/renderer_host/media/audio_renderer_host.cc',
-        'browser/renderer_host/media/audio_renderer_host.h',
-        'browser/renderer_host/media/audio_sync_reader.cc',
-        'browser/renderer_host/media/audio_sync_reader.h',
-        'browser/renderer_host/media/media_stream_device_settings.cc',
-        'browser/renderer_host/media/media_stream_device_settings.h',
-        'browser/renderer_host/media/media_stream_dispatcher_host.cc',
-        'browser/renderer_host/media/media_stream_dispatcher_host.h',
-        'browser/renderer_host/media/media_stream_manager.cc',
-        'browser/renderer_host/media/media_stream_manager.h',
-        'browser/renderer_host/media/media_stream_provider.h',
-        'browser/renderer_host/media/media_stream_requester.h',
-        'browser/renderer_host/media/media_stream_settings_requester.h',
-        'browser/renderer_host/media/video_capture_controller.cc',
-        'browser/renderer_host/media/video_capture_controller.h',
-        'browser/renderer_host/media/video_capture_controller_event_handler.cc',
-        'browser/renderer_host/media/video_capture_controller_event_handler.h',
-        'browser/renderer_host/media/video_capture_host.cc',
-        'browser/renderer_host/media/video_capture_host.h',
-        'browser/renderer_host/media/video_capture_manager.cc',
-        'browser/renderer_host/media/video_capture_manager.h',
-        'browser/renderer_host/pepper_file_message_filter.cc',
-        'browser/renderer_host/pepper_file_message_filter.h',
-        'browser/renderer_host/pepper_message_filter.cc',
-        'browser/renderer_host/pepper_message_filter.h',
-        'browser/renderer_host/quota_dispatcher_host.cc',
-        'browser/renderer_host/quota_dispatcher_host.h',
-        'browser/renderer_host/redirect_to_file_resource_handler.cc',
-        'browser/renderer_host/redirect_to_file_resource_handler.h',
-        'browser/renderer_host/render_message_filter.cc',
-        'browser/renderer_host/render_message_filter.h',
-        'browser/renderer_host/render_message_filter_aura.cc',
-        'browser/renderer_host/render_message_filter_win.cc',
-        'browser/renderer_host/render_process_host.cc',
-        'browser/renderer_host/render_process_host.h',
-        'browser/renderer_host/render_sandbox_host_linux.cc',
-        'browser/renderer_host/render_sandbox_host_linux.h',
-        'browser/renderer_host/render_view_host.cc',
-        'browser/renderer_host/render_view_host.h',
-        'browser/renderer_host/render_view_host_delegate.cc',
-        'browser/renderer_host/render_view_host_delegate.h',
-        'browser/renderer_host/render_view_host_factory.cc',
-        'browser/renderer_host/render_view_host_factory.h',
-        'browser/renderer_host/render_view_host_notification_task.h',
-        'browser/renderer_host/render_view_host_observer.cc',
-        'browser/renderer_host/render_view_host_observer.h',
-        'browser/renderer_host/render_widget_fullscreen_host.cc',
-        'browser/renderer_host/render_widget_fullscreen_host.h',
-        'browser/renderer_host/render_widget_helper.cc',
-        'browser/renderer_host/render_widget_helper.h',
-        'browser/renderer_host/render_widget_host.cc',
-        'browser/renderer_host/render_widget_host.h',
-        'browser/renderer_host/render_widget_host_gtk.cc',
-        'browser/renderer_host/render_widget_host_mac.cc',
-        'browser/renderer_host/render_widget_host_view.cc',
-        'browser/renderer_host/render_widget_host_view.h',
-        'browser/renderer_host/render_widget_host_view_gtk.cc',
-        'browser/renderer_host/render_widget_host_view_gtk.h',
-        'browser/renderer_host/render_widget_host_view_win.cc',
-        'browser/renderer_host/render_widget_host_view_win.h',
-        'browser/renderer_host/resource_dispatcher_host.cc',
-        'browser/renderer_host/resource_dispatcher_host.h',
-        'browser/renderer_host/resource_dispatcher_host_delegate.h',
-        'browser/renderer_host/resource_dispatcher_host_login_delegate.cc',
-        'browser/renderer_host/resource_dispatcher_host_login_delegate.h',
-        'browser/renderer_host/resource_dispatcher_host_request_info.cc',
-        'browser/renderer_host/resource_dispatcher_host_request_info.h',
-        'browser/renderer_host/resource_handler.h',
-        'browser/renderer_host/resource_message_filter.cc',
-        'browser/renderer_host/resource_message_filter.h',
-        'browser/renderer_host/resource_queue.cc',
-        'browser/renderer_host/resource_queue.h',
-        'browser/renderer_host/resource_request_details.cc',
-        'browser/renderer_host/resource_request_details.h',
-        'browser/renderer_host/socket_stream_dispatcher_host.cc',
-        'browser/renderer_host/socket_stream_dispatcher_host.h',
-        'browser/renderer_host/socket_stream_host.cc',
-        'browser/renderer_host/socket_stream_host.h',
-        'browser/renderer_host/sync_resource_handler.cc',
-        'browser/renderer_host/sync_resource_handler.h',
-        'browser/renderer_host/text_input_client_mac.h',
-        'browser/renderer_host/text_input_client_mac.mm',
-        'browser/renderer_host/text_input_client_message_filter.h',
-        'browser/renderer_host/text_input_client_message_filter.mm',
-        'browser/renderer_host/x509_user_cert_resource_handler.cc',
-        'browser/renderer_host/x509_user_cert_resource_handler.h',
-        'browser/resolve_proxy_msg_helper.cc',
-        'browser/resolve_proxy_msg_helper.h',
-        'browser/resource_context.cc',
-        'browser/resource_context.h',
-        'browser/safe_util_win.cc',
-        'browser/safe_util_win.h',
-        'browser/sensors/sensors_provider.cc',
-        'browser/sensors/sensors_provider.h',
-        'browser/sensors/sensors_provider_impl.cc',
-        'browser/sensors/sensors_provider_impl.h',
-        'browser/site_instance.cc',
-        'browser/site_instance.h',
-        'browser/speech/audio_encoder.cc',
-        'browser/speech/audio_encoder.h',
-        'browser/speech/endpointer/endpointer.cc',
-        'browser/speech/endpointer/endpointer.h',
-        'browser/speech/endpointer/energy_endpointer.cc',
-        'browser/speech/endpointer/energy_endpointer.h',
-        'browser/speech/endpointer/energy_endpointer_params.cc',
-        'browser/speech/endpointer/energy_endpointer_params.h',
-        'browser/speech/speech_input_dispatcher_host.cc',
-        'browser/speech/speech_input_dispatcher_host.h',
-        'browser/speech/speech_input_manager.cc',
-        'browser/speech/speech_input_manager.h',
-        'browser/speech/speech_recognition_request.cc',
-        'browser/speech/speech_recognition_request.h',
-        'browser/speech/speech_recognizer.cc',
-        'browser/speech/speech_recognizer.h',
-        'browser/ssl/ssl_cert_error_handler.cc',
-        'browser/ssl/ssl_cert_error_handler.h',
-        'browser/ssl/ssl_client_auth_handler.cc',
-        'browser/ssl/ssl_client_auth_handler.h',
-        'browser/ssl/ssl_client_auth_notification_details.cc',
-        'browser/ssl/ssl_client_auth_notification_details.h',
-        'browser/ssl/ssl_error_handler.cc',
-        'browser/ssl/ssl_error_handler.h',
-        'browser/ssl/ssl_host_state.cc',
-        'browser/ssl/ssl_host_state.h',
-        'browser/ssl/ssl_manager.cc',
-        'browser/ssl/ssl_manager.h',
-        'browser/ssl/ssl_policy.cc',
-        'browser/ssl/ssl_policy.h',
-        'browser/ssl/ssl_policy_backend.cc',
-        'browser/ssl/ssl_policy_backend.h',
-        'browser/ssl/ssl_request_info.cc',
-        'browser/ssl/ssl_request_info.h',
-        'browser/tab_contents/constrained_window.h',
-        'browser/tab_contents/interstitial_page.cc',
-        'browser/tab_contents/interstitial_page.h',
-        'browser/tab_contents/navigation_controller.cc',
-        'browser/tab_contents/navigation_controller.h',
-        'browser/tab_contents/navigation_details.cc',
-        'browser/tab_contents/navigation_details.h',
-        'browser/tab_contents/navigation_entry.cc',
-        'browser/tab_contents/navigation_entry.h',
-        'browser/tab_contents/page_navigator.cc',
-        'browser/tab_contents/page_navigator.h',
-        'browser/tab_contents/provisional_load_details.cc',
-        'browser/tab_contents/provisional_load_details.h',
-        'browser/tab_contents/render_view_host_manager.cc',
-        'browser/tab_contents/render_view_host_manager.h',
-        'browser/tab_contents/tab_contents.cc',
-        'browser/tab_contents/tab_contents.h',
-        'browser/tab_contents/tab_contents_delegate.cc',
-        'browser/tab_contents/tab_contents_delegate.h',
-        'browser/tab_contents/tab_contents_observer.cc',
-        'browser/tab_contents/tab_contents_observer.h',
-        'browser/tab_contents/tab_contents_view.cc',
-        'browser/tab_contents/tab_contents_view.h',
-        'browser/tab_contents/title_updated_details.h',
-        'browser/trace_controller.cc',
-        'browser/trace_controller.h',
-        'browser/trace_message_filter.cc',
-        'browser/trace_message_filter.h',
-        'browser/trace_subscriber_stdio.cc',
-        'browser/trace_subscriber_stdio.h',
-        'browser/user_metrics.cc',
-        'browser/user_metrics.h',
-        'browser/utility_process_host.cc',
-        'browser/utility_process_host.h',
-        'browser/webui/empty_web_ui_factory.cc',
-        'browser/webui/empty_web_ui_factory.h',
-        'browser/webui/generic_handler.cc',
-        'browser/webui/generic_handler.h',
-        'browser/webui/web_ui.cc',
-        'browser/webui/web_ui.h',
-        'browser/webui/web_ui_factory.cc',
-        'browser/webui/web_ui_factory.h',
-        'browser/worker_host/message_port_service.cc',
-        'browser/worker_host/message_port_service.h',
-        'browser/worker_host/worker_document_set.cc',
-        'browser/worker_host/worker_document_set.h',
-        'browser/worker_host/worker_message_filter.cc',
-        'browser/worker_host/worker_message_filter.h',
-        'browser/worker_host/worker_process_host.cc',
-        'browser/worker_host/worker_process_host.h',
-        'browser/worker_host/worker_service.cc',
-        'browser/worker_host/worker_service.h',
-        'browser/zygote_host_linux.cc',
-        'browser/zygote_host_linux.h',
-        'browser/zygote_main_linux.cc',
+      ],
+    }],
+    ['toolkit_uses_gtk == 1', {
+      'dependencies': [
+        '../build/linux/system.gyp:dbus',
+        # For FcLangSetAdd call in render_sandbox_host_linux.cc
+        '../build/linux/system.gyp:fontconfig',
+        '../build/linux/system.gyp:gtk',
+        # For XShm* in backing_store_x.cc
+        '../build/linux/system.gyp:x11',
+        '../dbus/dbus.gyp:dbus',
       ],
       'conditions': [
-        ['p2p_apis==1', {
-          'sources': [
-            'browser/renderer_host/p2p/socket_host.cc',
-            'browser/renderer_host/p2p/socket_host.h',
-            'browser/renderer_host/p2p/socket_host_tcp.cc',
-            'browser/renderer_host/p2p/socket_host_tcp.h',
-            'browser/renderer_host/p2p/socket_host_tcp_server.cc',
-            'browser/renderer_host/p2p/socket_host_tcp_server.h',
-            'browser/renderer_host/p2p/socket_host_udp.cc',
-            'browser/renderer_host/p2p/socket_host_udp.h',
-            'browser/renderer_host/p2p/socket_dispatcher_host.cc',
-            'browser/renderer_host/p2p/socket_dispatcher_host.h',
-          ],
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            # For accessibility
-            '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
-            '../third_party/isimpledom/isimpledom.gyp:isimpledom',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-llocationapi.lib',
-              '-lsensorsapi.lib',
-            ],
-          },
-          'sources!': [
-            'browser/power_save_blocker_stub.cc',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus',
-            # For FcLangSetAdd call in render_sandbox_host_linux.cc
-            '../build/linux/system.gyp:fontconfig',
-            '../build/linux/system.gyp:gtk',
-            # For XShm* in backing_store_x.cc
-            '../build/linux/system.gyp:x11',
-            '../dbus/dbus.gyp:dbus',
-          ],
-          'conditions': [
-            ['linux_sandbox_path != ""', {
-              'defines': [
-                'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
-              ],
-            }],
-          ],
-        }],
-        ['OS=="linux" and toolkit_views==1',{
-          'dependencies': [
-            '../views/views.gyp:views',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources!': [
-            'browser/power_save_blocker_stub.cc',
-          ],
-          'link_settings': {
-            'mac_bundle_resources': [
-              'browser/gpu.sb',
-              'browser/worker.sb',
-            ],
-          },
-        }, { # OS!="mac"
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:dbus-glib',
-          ],
-          'sources!': [
-            'browser/renderer_host/gtk_key_bindings_handler.cc',
-            'browser/renderer_host/gtk_key_bindings_handler.h',
-          ],
-        }],
-        ['touchui==1', {
-          'sources/': [
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
-          ],
-        }],
-        ['use_aura==1', {
-          'sources/': [
-            ['exclude', '^browser/accessibility/browser_accessibility_manager_win.cc'],
-            ['exclude', '^browser/accessibility/browser_accessibility_manager_win.h'],
-            ['exclude', '^browser/accessibility/browser_accessibility_win.cc'],
-            ['exclude', '^browser/accessibility/browser_accessibility_win.h'],
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
-            ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
-            ['exclude', '^browser/renderer_host/render_widget_host.h'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'],
-            ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'],
-            ['exclude', '^browser/renderer_host/render_message_filter_win.cc'],
+        ['linux_sandbox_path != ""', {
+          'defines': [
+            'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
           ],
         }],
       ],
+    }],
+    ['OS=="linux" and toolkit_views==1',{
+      'dependencies': [
+        '../views/views.gyp:views',
+      ],
+    }],
+    ['OS=="mac"', {
+      'sources!': [
+        'browser/power_save_blocker_stub.cc',
+      ],
+      'link_settings': {
+        'mac_bundle_resources': [
+          'browser/gpu.sb',
+          'browser/worker.sb',
+        ],
+      },
+    }, { # OS!="mac"
+      'dependencies': [
+        '../sandbox/sandbox.gyp:sandbox',
+      ],
+    }],
+    ['chromeos==1', {
+      'dependencies': [
+        '../build/linux/system.gyp:dbus-glib',
+      ],
+      'sources!': [
+        'browser/renderer_host/gtk_key_bindings_handler.cc',
+        'browser/renderer_host/gtk_key_bindings_handler.h',
+      ],
+    }],
+    ['touchui==1', {
+      'sources/': [
+        ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
+        ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
+        ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
+        ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
+      ],
+    }],
+    ['use_aura==1', {
+      'sources/': [
+        ['exclude', '^browser/accessibility/browser_accessibility_manager_win.cc'],
+        ['exclude', '^browser/accessibility/browser_accessibility_manager_win.h'],
+        ['exclude', '^browser/accessibility/browser_accessibility_win.cc'],
+        ['exclude', '^browser/accessibility/browser_accessibility_win.h'],
+        ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
+        ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
+        ['exclude', '^browser/renderer_host/render_widget_host.h'],
+        ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'],
+        ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'],
+        ['exclude', '^browser/renderer_host/render_message_filter_win.cc'],
+      ],
+    }],
+  ],
 }
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index 5d89a61..9714ae4 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -3,86 +3,85 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../skia/skia.gyp:skia',
-        '../ui/gfx/gl/gl.gyp:gl',
-      ],
-      'sources': [
-        'gpu/gpu_dx_diagnostics_win.cc',
-        'gpu/gpu_info_collector_linux.cc',
-        'gpu/gpu_info_collector_mac.mm',
-        'gpu/gpu_info_collector_win.cc',
-        'gpu/gpu_info_collector.cc',
-        'gpu/gpu_info_collector.h',
-        'gpu/gpu_main.cc',
-        'gpu/gpu_process.cc',
-        'gpu/gpu_process.h',
-        'gpu/gpu_child_thread.cc',
-        'gpu/gpu_child_thread.h',
-        'gpu/gpu_watchdog_thread.cc',
-        'gpu/gpu_watchdog_thread.h',
-      ],
+  'dependencies': [
+    '../base/base.gyp:base',
+    '../skia/skia.gyp:skia',
+    '../ui/gfx/gl/gl.gyp:gl',
+  ],
+  'sources': [
+    'gpu/gpu_dx_diagnostics_win.cc',
+    'gpu/gpu_info_collector_linux.cc',
+    'gpu/gpu_info_collector_mac.mm',
+    'gpu/gpu_info_collector_win.cc',
+    'gpu/gpu_info_collector.cc',
+    'gpu/gpu_info_collector.h',
+    'gpu/gpu_main.cc',
+    'gpu/gpu_process.cc',
+    'gpu/gpu_process.h',
+    'gpu/gpu_child_thread.cc',
+    'gpu/gpu_child_thread.h',
+    'gpu/gpu_watchdog_thread.cc',
+    'gpu/gpu_watchdog_thread.h',
+  ],
+  'include_dirs': [
+    '..',
+  ],
+  'conditions': [
+    ['OS=="win"', {
       'include_dirs': [
-        '..',
+        '<(DEPTH)/third_party/angle/include',
+        '<(DEPTH)/third_party/angle/src',
+        '<(DEPTH)/third_party/wtl/include',
+        '$(DXSDK_DIR)/include',
+      ],
+      'dependencies': [
+        '../third_party/angle/src/build_angle.gyp:libEGL',
+        '../third_party/angle/src/build_angle.gyp:libGLESv2',
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/angle/include',
-            '<(DEPTH)/third_party/angle/src',
-            '<(DEPTH)/third_party/wtl/include',
-            '$(DXSDK_DIR)/include',
+    }],
+    ['OS=="win" and directxsdk_exists=="True"', {
+      'actions': [
+        {
+          'action_name': 'extract_d3dx9',
+          'variables': {
+            'input': 'Jun2010_d3dx9_43_x86.cab',
+            'output': 'd3dx9_43.dll',
+          },
+          'inputs': [
+            '../third_party/directxsdk/files/Redist/<(input)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/<(output)',
+          ],
+          'action': [
+            'python',
+            '../build/extract_from_cab.py',
+            '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
+            '<(output)',
+            '<(PRODUCT_DIR)',
+          ],
+        },
+        {
+          'action_name': 'extract_d3dcompiler',
+          'variables': {
+            'input': 'Jun2010_D3DCompiler_43_x86.cab',
+            'output': 'D3DCompiler_43.dll',
+          },
+          'inputs': [
+            '../third_party/directxsdk/files/Redist/<(input)',
           ],
-          'dependencies': [
-            '../third_party/angle/src/build_angle.gyp:libEGL',
-            '../third_party/angle/src/build_angle.gyp:libGLESv2',
+          'outputs': [
+            '<(PRODUCT_DIR)/<(output)',
           ],
-        }],
-        ['OS=="win" and directxsdk_exists=="True"', {
-          'actions': [
-            {
-              'action_name': 'extract_d3dx9',
-              'variables': {
-                'input': 'Jun2010_d3dx9_43_x86.cab',
-                'output': 'd3dx9_43.dll',
-              },
-              'inputs': [
-                '../third_party/directxsdk/files/Redist/<(input)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/<(output)',
-              ],
-              'action': [
-                'python',
-                '../build/extract_from_cab.py',
-                '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
-                '<(output)',
-                '<(PRODUCT_DIR)',
-              ],
-            },
-            {
-              'action_name': 'extract_d3dcompiler',
-              'variables': {
-                'input': 'Jun2010_D3DCompiler_43_x86.cab',
-                'output': 'D3DCompiler_43.dll',
-              },
-              'inputs': [
-                '../third_party/directxsdk/files/Redist/<(input)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/<(output)',
-              ],
-              'action': [
-                'python',
-                '../build/extract_from_cab.py',
-                '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
-                '<(output)',
-                '<(PRODUCT_DIR)',
-              ],
-            },
+          'action': [
+            'python',
+            '../build/extract_from_cab.py',
+            '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
+            '<(output)',
+            '<(PRODUCT_DIR)',
           ],
-        }],
+        },
       ],
+    }],
+  ],
 }
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 4ef9ca2..e1dd81d 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -3,52 +3,51 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/support/webkit_support.gyp:glue',
-      ],
+  'dependencies': [
+    '../skia/skia.gyp:skia',
+    '../third_party/npapi/npapi.gyp:npapi',
+    '../webkit/support/webkit_support.gyp:glue',
+  ],
+  'include_dirs': [
+    '<(INTERMEDIATE_DIR)',
+  ],
+  'sources': [
+    # All .cc, .h, .m, and .mm files under plugins except for tests and
+    # mocks.
+    'plugin/content_plugin_client.h',
+    'plugin/plugin_channel.cc',
+    'plugin/plugin_channel.h',
+    'plugin/plugin_interpose_util_mac.mm',
+    'plugin/plugin_interpose_util_mac.h',
+    'plugin/plugin_main.cc',
+    'plugin/plugin_main_linux.cc',
+    'plugin/plugin_main_mac.mm',
+    'plugin/plugin_thread.cc',
+    'plugin/plugin_thread.h',
+    'plugin/webplugin_accelerated_surface_proxy_mac.cc',
+    'plugin/webplugin_accelerated_surface_proxy_mac.h',
+    'plugin/webplugin_delegate_stub.cc',
+    'plugin/webplugin_delegate_stub.h',
+    'plugin/webplugin_proxy.cc',
+    'plugin/webplugin_proxy.h',
+  ],
+  # These are layered in conditionals in the event other platforms
+  # end up using this module as well.
+  'conditions': [
+    ['OS=="win"', {
       'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
+        '<(DEPTH)/third_party/wtl/include',
       ],
-      'sources': [
-        # All .cc, .h, .m, and .mm files under plugins except for tests and
-        # mocks.
-        'plugin/content_plugin_client.h',
-        'plugin/plugin_channel.cc',
-        'plugin/plugin_channel.h',
-        'plugin/plugin_interpose_util_mac.mm',
-        'plugin/plugin_interpose_util_mac.h',
-        'plugin/plugin_main.cc',
-        'plugin/plugin_main_linux.cc',
-        'plugin/plugin_main_mac.mm',
-        'plugin/plugin_thread.cc',
-        'plugin/plugin_thread.h',
-        'plugin/webplugin_accelerated_surface_proxy_mac.cc',
-        'plugin/webplugin_accelerated_surface_proxy_mac.h',
-        'plugin/webplugin_delegate_stub.cc',
-        'plugin/webplugin_delegate_stub.h',
-        'plugin/webplugin_proxy.cc',
-        'plugin/webplugin_proxy.h',
-      ],
-      # These are layered in conditionals in the event other platforms
-      # end up using this module as well.
-      'conditions': [
-        ['OS=="win"', {
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lXext',
-            ],
-          },
-        }],
+    }],
+    ['toolkit_uses_gtk == 1', {
+      'dependencies': [
+        '../build/linux/system.gyp:gtk',
       ],
+      'link_settings': {
+        'libraries': [
+          '-lXext',
+        ],
+      },
+    }],
+  ],
 }
diff --git a/content/content_ppapi_plugin.gypi b/content/content_ppapi_plugin.gypi
index 9efd3e1..fcc58da 100644
--- a/content/content_ppapi_plugin.gypi
+++ b/content/content_ppapi_plugin.gypi
@@ -3,35 +3,34 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../ppapi/ppapi_internal.gyp:ppapi_proxy',
-      ],
-      'sources': [
-        'ppapi_plugin/broker_process_dispatcher.cc',
-        'ppapi_plugin/broker_process_dispatcher.h',
-        'ppapi_plugin/plugin_process_dispatcher.cc',
-        'ppapi_plugin/plugin_process_dispatcher.h',
-        'ppapi_plugin/ppapi_broker_main.cc',
-        'ppapi_plugin/ppapi_plugin_main.cc',
-        'ppapi_plugin/ppapi_thread.cc',
-        'ppapi_plugin/ppapi_thread.h',
-        'ppapi_plugin/ppapi_webkit_thread.cc',
-        'ppapi_plugin/ppapi_webkit_thread.h',
-        'ppapi_plugin/ppapi_webkitplatformsupport_impl.cc',
-        'ppapi_plugin/ppapi_webkitplatformsupport_impl.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          'link_settings': {
-            'mac_bundle_resources': [
-              'ppapi_plugin/ppapi.sb',
-            ],
-          },
-        }],
-      ],
+  'dependencies': [
+    '../base/base.gyp:base',
+    '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+  ],
+  'sources': [
+    'ppapi_plugin/broker_process_dispatcher.cc',
+    'ppapi_plugin/broker_process_dispatcher.h',
+    'ppapi_plugin/plugin_process_dispatcher.cc',
+    'ppapi_plugin/plugin_process_dispatcher.h',
+    'ppapi_plugin/ppapi_broker_main.cc',
+    'ppapi_plugin/ppapi_plugin_main.cc',
+    'ppapi_plugin/ppapi_thread.cc',
+    'ppapi_plugin/ppapi_thread.h',
+    'ppapi_plugin/ppapi_webkit_thread.cc',
+    'ppapi_plugin/ppapi_webkit_thread.h',
+    'ppapi_plugin/ppapi_webkitplatformsupport_impl.cc',
+    'ppapi_plugin/ppapi_webkitplatformsupport_impl.h',
+  ],
+  'include_dirs': [
+    '..',
+  ],
+  'conditions': [
+    ['OS=="mac"', {
+      'link_settings': {
+        'mac_bundle_resources': [
+          'ppapi_plugin/ppapi.sb',
+        ],
+      },
+    }],
+  ],
 }
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index d8acb58..e8a94e9 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -3,244 +3,243 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../jingle/jingle.gyp:jingle_glue',
-        '../net/net.gyp:net',
-        '../ppapi/ppapi_internal.gyp:ppapi_proxy',
-        '../skia/skia.gyp:skia',
-        '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/libjingle/libjingle.gyp:libjingle',
-        '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
-        '../third_party/npapi/npapi.gyp:npapi',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../ui/gfx/surface/surface.gyp:surface',
-        '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/support/webkit_support.gyp:webkit_gpu',
+  'dependencies': [
+    '../jingle/jingle.gyp:jingle_glue',
+    '../net/net.gyp:net',
+    '../ppapi/ppapi_internal.gyp:ppapi_proxy',
+    '../skia/skia.gyp:skia',
+    '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+    '../third_party/icu/icu.gyp:icuuc',
+    '../third_party/icu/icu.gyp:icui18n',
+    '../third_party/libjingle/libjingle.gyp:libjingle',
+    '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
+    '../third_party/npapi/npapi.gyp:npapi',
+    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+    '../ui/gfx/surface/surface.gyp:surface',
+    '../v8/tools/gyp/v8.gyp:v8',
+    '../webkit/support/webkit_support.gyp:webkit_gpu',
+  ],
+  'include_dirs': [
+    '..',
+  ],
+  'sources': [
+    'renderer/active_notification_tracker.cc',
+    'renderer/active_notification_tracker.h',
+    'renderer/content_renderer_client.h',
+    'renderer/device_orientation_dispatcher.cc',
+    'renderer/device_orientation_dispatcher.h',
+    'renderer/devtools_agent.cc',
+    'renderer/devtools_agent.h',
+    'renderer/devtools_agent_filter.cc',
+    'renderer/devtools_agent_filter.h',
+    'renderer/devtools_client.cc',
+    'renderer/devtools_client.h',
+    'renderer/external_popup_menu.cc',
+    'renderer/external_popup_menu.h',
+    'renderer/geolocation_dispatcher.cc',
+    'renderer/geolocation_dispatcher.h',
+    'renderer/gpu/gpu_channel_host.cc',
+    'renderer/gpu/gpu_channel_host.h',
+    'renderer/gpu/gpu_video_decode_accelerator_host.cc',
+    'renderer/gpu/gpu_video_decode_accelerator_host.h',
+    'renderer/gpu/renderer_gl_context.cc',
+    'renderer/gpu/renderer_gl_context.h',
+    'renderer/gpu/transport_texture_host.cc',
+    'renderer/gpu/transport_texture_host.h',
+    'renderer/gpu/transport_texture_service.cc',
+    'renderer/gpu/transport_texture_service.h',
+    'renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc',
+    'renderer/gpu/webgraphicscontext3d_command_buffer_impl.h',
+    'renderer/indexed_db_dispatcher.cc',
+    'renderer/indexed_db_dispatcher.h',
+    'renderer/intents_dispatcher.cc',
+    'renderer/intents_dispatcher.h',
+    'renderer/load_progress_tracker.cc',
+    'renderer/load_progress_tracker.h',
+    'renderer/media/audio_device.cc',
+    'renderer/media/audio_device.h',
+    'renderer/media/audio_input_device.cc',
+    'renderer/media/audio_input_device.h',
+    'renderer/media/audio_input_message_filter.cc',
+    'renderer/media/audio_input_message_filter.h',
+    'renderer/media/audio_message_filter.cc',
+    'renderer/media/audio_message_filter.h',
+    'renderer/media/audio_renderer_impl.cc',
+    'renderer/media/audio_renderer_impl.h',
+    'renderer/media/capture_video_decoder.cc',
+    'renderer/media/capture_video_decoder.h',
+    'renderer/media/media_stream_dispatcher.cc',
+    'renderer/media/media_stream_dispatcher.h',
+    'renderer/media/media_stream_dispatcher_eventhandler.h',
+    'renderer/media/media_stream_impl.cc',
+    'renderer/media/media_stream_impl.h',
+    'renderer/media/render_media_log.cc',
+    'renderer/media/render_media_log.h',
+    'renderer/media/rtc_video_decoder.cc',
+    'renderer/media/rtc_video_decoder.h',
+    'renderer/media/video_capture_impl.cc',
+    'renderer/media/video_capture_impl.h',
+    'renderer/media/video_capture_impl_manager.cc',
+    'renderer/media/video_capture_impl_manager.h',
+    'renderer/media/video_capture_message_filter.cc',
+    'renderer/media/video_capture_message_filter.h',
+    'renderer/mhtml_generator.cc',
+    'renderer/mhtml_generator.h',
+    'renderer/navigation_state.cc',
+    'renderer/navigation_state.h',
+    'renderer/notification_provider.cc',
+    'renderer/notification_provider.h',
+    'renderer/paint_aggregator.cc',
+    'renderer/paint_aggregator.h',
+    'renderer/pepper_platform_context_3d_impl.cc',
+    'renderer/pepper_platform_context_3d_impl.h',
+    'renderer/pepper_platform_video_decoder_impl.cc',
+    'renderer/pepper_platform_video_decoder_impl.h',
+    'renderer/pepper_plugin_delegate_impl.cc',
+    'renderer/pepper_plugin_delegate_impl.h',
+    'renderer/plugin_channel_host.cc',
+    'renderer/plugin_channel_host.h',
+    'renderer/render_process.h',
+    'renderer/render_process_impl.cc',
+    'renderer/render_process_impl.h',
+    'renderer/render_process_observer.cc',
+    'renderer/render_process_observer.h',
+    'renderer/render_thread.cc',
+    'renderer/render_thread.h',
+    'renderer/render_view.cc',
+    'renderer/render_view.h',
+    'renderer/render_view_linux.cc',
+    'renderer/render_view_observer.cc',
+    'renderer/render_view_observer.h',
+    'renderer/render_view_observer_tracker.h',
+    'renderer/render_view_selection.cc',
+    'renderer/render_view_selection.h',
+    'renderer/render_view_visitor.h',
+    'renderer/render_widget.cc',
+    'renderer/render_widget.h',
+    'renderer/render_widget_fullscreen.cc',
+    'renderer/render_widget_fullscreen.h',
+    'renderer/render_widget_fullscreen_pepper.cc',
+    'renderer/render_widget_fullscreen_pepper.h',
+    'renderer/renderer_glue.cc',
+    'renderer/renderer_main.cc',
+    'renderer/renderer_main_platform_delegate.h',
+    'renderer/renderer_main_platform_delegate_linux.cc',
+    'renderer/renderer_main_platform_delegate_mac.mm',
+    'renderer/renderer_main_platform_delegate_win.cc',
+    'renderer/renderer_webapplicationcachehost_impl.cc',
+    'renderer/renderer_webapplicationcachehost_impl.h',
+    'renderer/renderer_webaudiodevice_impl.cc',
+    'renderer/renderer_webaudiodevice_impl.h',
+    'renderer/renderer_webcookiejar_impl.cc',
+    'renderer/renderer_webcookiejar_impl.h',
+    'renderer/renderer_webidbcursor_impl.cc',
+    'renderer/renderer_webidbcursor_impl.h',
+    'renderer/renderer_webidbdatabase_impl.cc',
+    'renderer/renderer_webidbdatabase_impl.h',
+    'renderer/renderer_webidbfactory_impl.cc',
+    'renderer/renderer_webidbfactory_impl.h',
+    'renderer/renderer_webidbindex_impl.cc',
+    'renderer/renderer_webidbindex_impl.h',
+    'renderer/renderer_webidbobjectstore_impl.cc',
+    'renderer/renderer_webidbobjectstore_impl.h',
+    'renderer/renderer_webidbtransaction_impl.cc',
+    'renderer/renderer_webidbtransaction_impl.h',
+    'renderer/renderer_webkitplatformsupport_impl.cc',
+    'renderer/renderer_webkitplatformsupport_impl.h',
+    'renderer/renderer_webstoragearea_impl.cc',
+    'renderer/renderer_webstoragearea_impl.h',
+    'renderer/renderer_webstoragenamespace_impl.cc',
+    'renderer/renderer_webstoragenamespace_impl.h',
+    'renderer/speech_input_dispatcher.cc',
+    'renderer/speech_input_dispatcher.h',
+    'renderer/text_input_client_observer.cc',
+    'renderer/text_input_client_observer.h',
+    'renderer/v8_value_converter.cc',
+    'renderer/v8_value_converter.h',
+    'renderer/webplugin_delegate_proxy.cc',
+    'renderer/webplugin_delegate_proxy.h',
+    'renderer/websharedworker_proxy.cc',
+    'renderer/websharedworker_proxy.h',
+    'renderer/websharedworkerrepository_impl.cc',
+    'renderer/websharedworkerrepository_impl.h',
+    'renderer/webworker_base.cc',
+    'renderer/webworker_base.h',
+    'renderer/webworker_proxy.cc',
+    'renderer/webworker_proxy.h',
+    'renderer/web_ui_bindings.cc',
+    'renderer/web_ui_bindings.h',
+    'renderer/worker_devtools_agent_proxy.cc',
+    'renderer/worker_devtools_agent_proxy.h',
+  ],
+  'conditions': [
+    ['p2p_apis==1', {
+      'sources': [
+        'renderer/p2p/host_address_request.cc',
+        'renderer/p2p/host_address_request.h',
+        'renderer/p2p/ipc_network_manager.cc',
+        'renderer/p2p/ipc_network_manager.h',
+        'renderer/p2p/ipc_socket_factory.cc',
+        'renderer/p2p/ipc_socket_factory.h',
+        'renderer/p2p/p2p_transport_impl.cc',
+        'renderer/p2p/p2p_transport_impl.h',
+        'renderer/p2p/port_allocator.cc',
+        'renderer/p2p/port_allocator.h',
+        'renderer/p2p/socket_client.cc',
+        'renderer/p2p/socket_client.h',
+        'renderer/p2p/socket_dispatcher.cc',
+        'renderer/p2p/socket_dispatcher.h',
       ],
-      'include_dirs': [
-        '..',
+    }],
+    ['enable_gpu==1', {
+      'dependencies': [
+        '../gpu/gpu.gyp:gles2_c_lib',
       ],
       'sources': [
-        'renderer/active_notification_tracker.cc',
-        'renderer/active_notification_tracker.h',
-        'renderer/content_renderer_client.h',
-        'renderer/device_orientation_dispatcher.cc',
-        'renderer/device_orientation_dispatcher.h',
-        'renderer/devtools_agent.cc',
-        'renderer/devtools_agent.h',
-        'renderer/devtools_agent_filter.cc',
-        'renderer/devtools_agent_filter.h',
-        'renderer/devtools_client.cc',
-        'renderer/devtools_client.h',
-        'renderer/external_popup_menu.cc',
-        'renderer/external_popup_menu.h',
-        'renderer/geolocation_dispatcher.cc',
-        'renderer/geolocation_dispatcher.h',
-        'renderer/gpu/gpu_channel_host.cc',
-        'renderer/gpu/gpu_channel_host.h',
-        'renderer/gpu/gpu_video_decode_accelerator_host.cc',
-        'renderer/gpu/gpu_video_decode_accelerator_host.h',
-        'renderer/gpu/renderer_gl_context.cc',
-        'renderer/gpu/renderer_gl_context.h',
-        'renderer/gpu/transport_texture_host.cc',
-        'renderer/gpu/transport_texture_host.h',
-        'renderer/gpu/transport_texture_service.cc',
-        'renderer/gpu/transport_texture_service.h',
-        'renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc',
-        'renderer/gpu/webgraphicscontext3d_command_buffer_impl.h',
-        'renderer/indexed_db_dispatcher.cc',
-        'renderer/indexed_db_dispatcher.h',
-        'renderer/intents_dispatcher.cc',
-        'renderer/intents_dispatcher.h',
-        'renderer/load_progress_tracker.cc',
-        'renderer/load_progress_tracker.h',
-        'renderer/media/audio_device.cc',
-        'renderer/media/audio_device.h',
-        'renderer/media/audio_input_device.cc',
-        'renderer/media/audio_input_device.h',
-        'renderer/media/audio_input_message_filter.cc',
-        'renderer/media/audio_input_message_filter.h',
-        'renderer/media/audio_message_filter.cc',
-        'renderer/media/audio_message_filter.h',
-        'renderer/media/audio_renderer_impl.cc',
-        'renderer/media/audio_renderer_impl.h',
-        'renderer/media/capture_video_decoder.cc',
-        'renderer/media/capture_video_decoder.h',
-        'renderer/media/media_stream_dispatcher.cc',
-        'renderer/media/media_stream_dispatcher.h',
-        'renderer/media/media_stream_dispatcher_eventhandler.h',
-        'renderer/media/media_stream_impl.cc',
-        'renderer/media/media_stream_impl.h',
-        'renderer/media/render_media_log.cc',
-        'renderer/media/render_media_log.h',
-        'renderer/media/rtc_video_decoder.cc',
-        'renderer/media/rtc_video_decoder.h',
-        'renderer/media/video_capture_impl.cc',
-        'renderer/media/video_capture_impl.h',
-        'renderer/media/video_capture_impl_manager.cc',
-        'renderer/media/video_capture_impl_manager.h',
-        'renderer/media/video_capture_message_filter.cc',
-        'renderer/media/video_capture_message_filter.h',
-        'renderer/mhtml_generator.cc',
-        'renderer/mhtml_generator.h',
-        'renderer/navigation_state.cc',
-        'renderer/navigation_state.h',
-        'renderer/notification_provider.cc',
-        'renderer/notification_provider.h',
-        'renderer/paint_aggregator.cc',
-        'renderer/paint_aggregator.h',
-        'renderer/pepper_platform_context_3d_impl.cc',
-        'renderer/pepper_platform_context_3d_impl.h',
-        'renderer/pepper_platform_video_decoder_impl.cc',
-        'renderer/pepper_platform_video_decoder_impl.h',
-        'renderer/pepper_plugin_delegate_impl.cc',
-        'renderer/pepper_plugin_delegate_impl.h',
-        'renderer/plugin_channel_host.cc',
-        'renderer/plugin_channel_host.h',
-        'renderer/render_process.h',
-        'renderer/render_process_impl.cc',
-        'renderer/render_process_impl.h',
-        'renderer/render_process_observer.cc',
-        'renderer/render_process_observer.h',
-        'renderer/render_thread.cc',
-        'renderer/render_thread.h',
-        'renderer/render_view.cc',
-        'renderer/render_view.h',
-        'renderer/render_view_linux.cc',
-        'renderer/render_view_observer.cc',
-        'renderer/render_view_observer.h',
-        'renderer/render_view_observer_tracker.h',
-        'renderer/render_view_selection.cc',
-        'renderer/render_view_selection.h',
-        'renderer/render_view_visitor.h',
-        'renderer/render_widget.cc',
-        'renderer/render_widget.h',
-        'renderer/render_widget_fullscreen.cc',
-        'renderer/render_widget_fullscreen.h',
-        'renderer/render_widget_fullscreen_pepper.cc',
-        'renderer/render_widget_fullscreen_pepper.h',
-        'renderer/renderer_glue.cc',
-        'renderer/renderer_main.cc',
-        'renderer/renderer_main_platform_delegate.h',
-        'renderer/renderer_main_platform_delegate_linux.cc',
-        'renderer/renderer_main_platform_delegate_mac.mm',
-        'renderer/renderer_main_platform_delegate_win.cc',
-        'renderer/renderer_webapplicationcachehost_impl.cc',
-        'renderer/renderer_webapplicationcachehost_impl.h',
-        'renderer/renderer_webaudiodevice_impl.cc',
-        'renderer/renderer_webaudiodevice_impl.h',
-        'renderer/renderer_webcookiejar_impl.cc',
-        'renderer/renderer_webcookiejar_impl.h',
-        'renderer/renderer_webidbcursor_impl.cc',
-        'renderer/renderer_webidbcursor_impl.h',
-        'renderer/renderer_webidbdatabase_impl.cc',
-        'renderer/renderer_webidbdatabase_impl.h',
-        'renderer/renderer_webidbfactory_impl.cc',
-        'renderer/renderer_webidbfactory_impl.h',
-        'renderer/renderer_webidbindex_impl.cc',
-        'renderer/renderer_webidbindex_impl.h',
-        'renderer/renderer_webidbobjectstore_impl.cc',
-        'renderer/renderer_webidbobjectstore_impl.h',
-        'renderer/renderer_webidbtransaction_impl.cc',
-        'renderer/renderer_webidbtransaction_impl.h',
-        'renderer/renderer_webkitplatformsupport_impl.cc',
-        'renderer/renderer_webkitplatformsupport_impl.h',
-        'renderer/renderer_webstoragearea_impl.cc',
-        'renderer/renderer_webstoragearea_impl.h',
-        'renderer/renderer_webstoragenamespace_impl.cc',
-        'renderer/renderer_webstoragenamespace_impl.h',
-        'renderer/speech_input_dispatcher.cc',
-        'renderer/speech_input_dispatcher.h',
-        'renderer/text_input_client_observer.cc',
-        'renderer/text_input_client_observer.h',
-        'renderer/v8_value_converter.cc',
-        'renderer/v8_value_converter.h',
-        'renderer/webplugin_delegate_proxy.cc',
-        'renderer/webplugin_delegate_proxy.h',
-        'renderer/websharedworker_proxy.cc',
-        'renderer/websharedworker_proxy.h',
-        'renderer/websharedworkerrepository_impl.cc',
-        'renderer/websharedworkerrepository_impl.h',
-        'renderer/webworker_base.cc',
-        'renderer/webworker_base.h',
-        'renderer/webworker_proxy.cc',
-        'renderer/webworker_proxy.h',
-        'renderer/web_ui_bindings.cc',
-        'renderer/web_ui_bindings.h',
-        'renderer/worker_devtools_agent_proxy.cc',
-        'renderer/worker_devtools_agent_proxy.h',
+        'renderer/gpu/command_buffer_proxy.cc',
+        'renderer/gpu/command_buffer_proxy.h',
       ],
+    }],
+    ['toolkit_uses_gtk == 1', {
       'conditions': [
-        ['p2p_apis==1', {
-          'sources': [
-            'renderer/p2p/host_address_request.cc',
-            'renderer/p2p/host_address_request.h',
-            'renderer/p2p/ipc_network_manager.cc',
-            'renderer/p2p/ipc_network_manager.h',
-            'renderer/p2p/ipc_socket_factory.cc',
-            'renderer/p2p/ipc_socket_factory.h',
-            'renderer/p2p/p2p_transport_impl.cc',
-            'renderer/p2p/p2p_transport_impl.h',
-            'renderer/p2p/port_allocator.cc',
-            'renderer/p2p/port_allocator.h',
-            'renderer/p2p/socket_client.cc',
-            'renderer/p2p/socket_client.h',
-            'renderer/p2p/socket_dispatcher.cc',
-            'renderer/p2p/socket_dispatcher.h',
-          ],
-        }],
-        ['enable_gpu==1', {
-          'dependencies': [
-            '../gpu/gpu.gyp:gles2_c_lib',
-          ],
-          'sources': [
-            'renderer/gpu/command_buffer_proxy.cc',
-            'renderer/gpu/command_buffer_proxy.h',
-          ],
-        }],
-        ['toolkit_uses_gtk == 1', {
-          'conditions': [
-            [ 'linux_use_tcmalloc==1', {
-              'dependencies': [
-                 '../base/allocator/allocator.gyp:allocator',
-              ],
-            }],
-          ],
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources!': [
-            'common/process_watcher_posix.cc',
-          ],
-          'link_settings': {
-            'mac_bundle_resources': [
-              'renderer/renderer.sb',
-            ],
-          },
-        }],
-        ['OS=="win" and win_use_allocator_shim==1', {
+        [ 'linux_use_tcmalloc==1', {
           'dependencies': [
-             '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-        ['enable_webrtc==1', {
-          'dependencies': [
-            '../third_party/webrtc/modules/modules.gyp:video_capture_module',
-            '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
-            '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
-          ],
-          'sources': [
-            'renderer/media/video_capture_module_impl.cc',
-            'renderer/media/video_capture_module_impl.h',
-            'renderer/media/webrtc_audio_device_impl.cc',
-            'renderer/media/webrtc_audio_device_impl.h',
+              '../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
+      'dependencies': [
+        '../build/linux/system.gyp:gtk',
+      ],
+    }],
+    ['OS=="mac"', {
+      'sources!': [
+        'common/process_watcher_posix.cc',
+      ],
+      'link_settings': {
+        'mac_bundle_resources': [
+          'renderer/renderer.sb',
+        ],
+      },
+    }],
+    ['OS=="win" and win_use_allocator_shim==1', {
+      'dependencies': [
+          '../base/allocator/allocator.gyp:allocator',
+      ],
+    }],
+    ['enable_webrtc==1', {
+      'dependencies': [
+        '../third_party/webrtc/modules/modules.gyp:video_capture_module',
+        '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+        '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
+        '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
+      ],
+      'sources': [
+        'renderer/media/video_capture_module_impl.cc',
+        'renderer/media/video_capture_module_impl.h',
+        'renderer/media/webrtc_audio_device_impl.cc',
+        'renderer/media/webrtc_audio_device_impl.h',
+      ],
+    }],
+  ],
 }
diff --git a/content/content_utility.gypi b/content/content_utility.gypi
index 0d2f700..d60e016 100644
--- a/content/content_utility.gypi
+++ b/content/content_utility.gypi
@@ -3,26 +3,25 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'utility/content_utility_client.h',
-        'utility/utility_main.cc',
-        'utility/utility_thread.cc',
-        'utility/utility_thread.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          'link_settings': {
-            'mac_bundle_resources': [
-              'utility/utility.sb',
-            ],
-          },
-        }],
-      ],
+  'dependencies': [
+    '../base/base.gyp:base',
+  ],
+  'sources': [
+    'utility/content_utility_client.h',
+    'utility/utility_main.cc',
+    'utility/utility_thread.cc',
+    'utility/utility_thread.h',
+  ],
+  'include_dirs': [
+    '..',
+  ],
+  'conditions': [
+    ['OS=="mac"', {
+      'link_settings': {
+        'mac_bundle_resources': [
+          'utility/utility.sb',
+        ],
+      },
+    }],
+  ],
 }
diff --git a/content/content_worker.gypi b/content/content_worker.gypi
index 48869df..47dd56b 100644
--- a/content/content_worker.gypi
+++ b/content/content_worker.gypi
@@ -3,32 +3,31 @@
 # found in the LICENSE file.
 
 {
-      # TODO(dpranke): Fix indentation.
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../skia/skia.gyp:skia',
-        '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'sources': [
-        'worker/websharedworker_stub.cc',
-        'worker/websharedworker_stub.h',
-        'worker/webworker_stub_base.cc',
-        'worker/webworker_stub_base.h',
-        'worker/webworker_stub.cc',
-        'worker/webworker_stub.h',
-        'worker/webworkerclient_proxy.cc',
-        'worker/webworkerclient_proxy.h',
-        'worker/worker_devtools_agent.cc',
-        'worker/worker_devtools_agent.h',
-        'worker/worker_main.cc',
-        'worker/worker_thread.cc',
-        'worker/worker_thread.h',
-        'worker/worker_webapplicationcachehost_impl.cc',
-        'worker/worker_webapplicationcachehost_impl.h',
-        'worker/worker_webkitplatformsupport_impl.cc',
-        'worker/worker_webkitplatformsupport_impl.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
+  'dependencies': [
+    '../base/base.gyp:base',
+    '../skia/skia.gyp:skia',
+    '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+  ],
+  'sources': [
+    'worker/websharedworker_stub.cc',
+    'worker/websharedworker_stub.h',
+    'worker/webworker_stub_base.cc',
+    'worker/webworker_stub_base.h',
+    'worker/webworker_stub.cc',
+    'worker/webworker_stub.h',
+    'worker/webworkerclient_proxy.cc',
+    'worker/webworkerclient_proxy.h',
+    'worker/worker_devtools_agent.cc',
+    'worker/worker_devtools_agent.h',
+    'worker/worker_main.cc',
+    'worker/worker_thread.cc',
+    'worker/worker_thread.h',
+    'worker/worker_webapplicationcachehost_impl.cc',
+    'worker/worker_webapplicationcachehost_impl.h',
+    'worker/worker_webkitplatformsupport_impl.cc',
+    'worker/worker_webkitplatformsupport_impl.h',
+  ],
+  'include_dirs': [
+    '..',
+  ],
 }