svn prop fixes. Applied to all files not in third_party.

* Removed eol-style, executable and mergeinfo from BMP/GIF/ICO/JPEG files, and set correct mime-type.
* Removed executable and mergeinfo from .c/.cc/.cpp/.h/.m/.mm and .gyp files, and set eol-style to LF.

TBR=evanm
BUG=none
TEST=none


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

190 files changed, 242 insertions, 242 deletions

diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
index 1b3d824..1b3d824 100755..100644
--- a/app/gfx/canvas_linux.cc
+++ b/app/gfx/canvas_linux.cc
diff --git a/app/gfx/font_skia.cc b/app/gfx/font_skia.cc
index eee1238..eee1238 100755..100644
--- a/app/gfx/font_skia.cc
+++ b/app/gfx/font_skia.cc
diff --git a/app/resources/browser_action_badge_center.png b/app/resources/browser_action_badge_center.png
index 289d5ef..289d5ef 100755..100644
--- a/app/resources/browser_action_badge_center.png
+++ b/app/resources/browser_action_badge_center.png
diff --git a/app/resources/browser_action_badge_left.png b/app/resources/browser_action_badge_left.png
index bb7581d..bb7581d 100755..100644
--- a/app/resources/browser_action_badge_left.png
+++ b/app/resources/browser_action_badge_left.png
diff --git a/app/resources/browser_action_badge_right.png b/app/resources/browser_action_badge_right.png
index b5fd5e3..b5fd5e3 100755..100644
--- a/app/resources/browser_action_badge_right.png
+++ b/app/resources/browser_action_badge_right.png
diff --git a/app/resources/frame_app_panel_default.png b/app/resources/frame_app_panel_default.png
index aea7e28..aea7e28 100755..100644
--- a/app/resources/frame_app_panel_default.png
+++ b/app/resources/frame_app_panel_default.png
diff --git a/app/resources/menu_arrow.png b/app/resources/menu_arrow.png
index 24ed897..24ed897 100755..100644
--- a/app/resources/menu_arrow.png
+++ b/app/resources/menu_arrow.png
diff --git a/app/resources/menu_check.png b/app/resources/menu_check.png
index dd714e0..dd714e0 100755..100644
--- a/app/resources/menu_check.png
+++ b/app/resources/menu_check.png
diff --git a/chrome/app/theme/balloon_close.png b/chrome/app/theme/balloon_close.png
index cd5609e..cd5609e 100755..100644
--- a/chrome/app/theme/balloon_close.png
+++ b/chrome/app/theme/balloon_close.png
diff --git a/chrome/app/theme/balloon_close_hover.png b/chrome/app/theme/balloon_close_hover.png
index 8d36beb..8d36beb 100755..100644
--- a/chrome/app/theme/balloon_close_hover.png
+++ b/chrome/app/theme/balloon_close_hover.png
diff --git a/chrome/app/theme/balloon_options_arrow.png b/chrome/app/theme/balloon_options_arrow.png
index e3d757c..e3d757c 100755..100644
--- a/chrome/app/theme/balloon_options_arrow.png
+++ b/chrome/app/theme/balloon_options_arrow.png
diff --git a/chrome/app/theme/balloon_options_arrow_hover.png b/chrome/app/theme/balloon_options_arrow_hover.png
index f4f6283..f4f6283 100755..100644
--- a/chrome/app/theme/balloon_options_arrow_hover.png
+++ b/chrome/app/theme/balloon_options_arrow_hover.png
diff --git a/chrome/app/theme/blocked_cookies.png b/chrome/app/theme/blocked_cookies.png
index ac8394e..ac8394e 100755..100644
--- a/chrome/app/theme/blocked_cookies.png
+++ b/chrome/app/theme/blocked_cookies.png
diff --git a/chrome/app/theme/blocked_images.png b/chrome/app/theme/blocked_images.png
index 4a68cef..4a68cef 100755..100644
--- a/chrome/app/theme/blocked_images.png
+++ b/chrome/app/theme/blocked_images.png
diff --git a/chrome/app/theme/blocked_javascript.png b/chrome/app/theme/blocked_javascript.png
index 5892f5d..5892f5d 100755..100644
--- a/chrome/app/theme/blocked_javascript.png
+++ b/chrome/app/theme/blocked_javascript.png
diff --git a/chrome/app/theme/blocked_plugins.png b/chrome/app/theme/blocked_plugins.png
index 4b5c9c9..4b5c9c9 100755..100644
--- a/chrome/app/theme/blocked_plugins.png
+++ b/chrome/app/theme/blocked_plugins.png
diff --git a/chrome/app/theme/blocked_popups.png b/chrome/app/theme/blocked_popups.png
index 939c988aa..939c988aa 100755..100644
--- a/chrome/app/theme/blocked_popups.png
+++ b/chrome/app/theme/blocked_popups.png
diff --git a/chrome/app/theme/geolocation_allowed_locationbar_icon.png b/chrome/app/theme/geolocation_allowed_locationbar_icon.png
index f2d500b..f2d500b 100755..100644
--- a/chrome/app/theme/geolocation_allowed_locationbar_icon.png
+++ b/chrome/app/theme/geolocation_allowed_locationbar_icon.png
diff --git a/chrome/app/theme/geolocation_denied_locationbar_icon.png b/chrome/app/theme/geolocation_denied_locationbar_icon.png
index c8a6c44..c8a6c44 100755..100644
--- a/chrome/app/theme/geolocation_denied_locationbar_icon.png
+++ b/chrome/app/theme/geolocation_denied_locationbar_icon.png
diff --git a/chrome/app/theme/geolocation_infobar_icon.png b/chrome/app/theme/geolocation_infobar_icon.png
index 2b3fcdf..2b3fcdf 100755..100644
--- a/chrome/app/theme/geolocation_infobar_icon.png
+++ b/chrome/app/theme/geolocation_infobar_icon.png
diff --git a/chrome/app/theme/theme_frame_default2.png b/chrome/app/theme/theme_frame_default2.png
index e70ed56..e70ed56 100755..100644
--- a/chrome/app/theme/theme_frame_default2.png
+++ b/chrome/app/theme/theme_frame_default2.png
diff --git a/chrome/app/theme/theme_frame_default_inactive2.png b/chrome/app/theme/theme_frame_default_inactive2.png
index 3e1d77e..3e1d77e 100755..100644
--- a/chrome/app/theme/theme_frame_default_inactive2.png
+++ b/chrome/app/theme/theme_frame_default_inactive2.png
diff --git a/chrome/app/theme/theme_frame_default_incognito2.png b/chrome/app/theme/theme_frame_default_incognito2.png
index b9cdd7b..b9cdd7b 100755..100644
--- a/chrome/app/theme/theme_frame_default_incognito2.png
+++ b/chrome/app/theme/theme_frame_default_incognito2.png
diff --git a/chrome/app/theme/theme_frame_default_incognito_inactive2.png b/chrome/app/theme/theme_frame_default_incognito_inactive2.png
index 2cda4fc..2cda4fc 100755..100644
--- a/chrome/app/theme/theme_frame_default_incognito_inactive2.png
+++ b/chrome/app/theme/theme_frame_default_incognito_inactive2.png
diff --git a/chrome/app/theme/theme_tab_background2.png b/chrome/app/theme/theme_tab_background2.png
index a31a8cd..a31a8cd 100755..100644
--- a/chrome/app/theme/theme_tab_background2.png
+++ b/chrome/app/theme/theme_tab_background2.png
diff --git a/chrome/app/theme/theme_toolbar_default2.png b/chrome/app/theme/theme_toolbar_default2.png
index e04555d..e04555d 100755..100644
--- a/chrome/app/theme/theme_toolbar_default2.png
+++ b/chrome/app/theme/theme_toolbar_default2.png
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index 50b8187..50b8187 100755..100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
diff --git a/chrome/browser/chromeos/status/browser_status_area_view.cc b/chrome/browser/chromeos/status/browser_status_area_view.cc
index 681c761..681c761 100755..100644
--- a/chrome/browser/chromeos/status/browser_status_area_view.cc
+++ b/chrome/browser/chromeos/status/browser_status_area_view.cc
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index 7e5ba46..7e5ba46 100755..100644
--- a/chrome/browser/chromeos/status/status_area_view.cc
+++ b/chrome/browser/chromeos/status/status_area_view.cc
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc
index 29de8fb..29de8fb 100755..100644
--- a/chrome/browser/extensions/extension_incognito_apitest.cc
+++ b/chrome/browser/extensions/extension_incognito_apitest.cc
diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc
index 8265405..8265405 100755..100644
--- a/chrome/browser/extensions/extension_websocket_apitest.cc
+++ b/chrome/browser/extensions/extension_websocket_apitest.cc
diff --git a/chrome/browser/notifications/notifications_uitest.cc b/chrome/browser/notifications/notifications_uitest.cc
index e6c1d32..e6c1d32 100755..100644
--- a/chrome/browser/notifications/notifications_uitest.cc
+++ b/chrome/browser/notifications/notifications_uitest.cc
diff --git a/chrome/browser/sync/engine/apply_updates_command_unittest.cc b/chrome/browser/sync/engine/apply_updates_command_unittest.cc
index 4ec7ee3..4ec7ee3 100755..100644
--- a/chrome/browser/sync/engine/apply_updates_command_unittest.cc
+++ b/chrome/browser/sync/engine/apply_updates_command_unittest.cc
diff --git a/chrome/browser/sync/engine/auth_watcher.cc b/chrome/browser/sync/engine/auth_watcher.cc
index 57fcec1..57fcec1 100755..100644
--- a/chrome/browser/sync/engine/auth_watcher.cc
+++ b/chrome/browser/sync/engine/auth_watcher.cc
diff --git a/chrome/browser/sync/engine/auth_watcher.h b/chrome/browser/sync/engine/auth_watcher.h
index 6119401..6119401 100755..100644
--- a/chrome/browser/sync/engine/auth_watcher.h
+++ b/chrome/browser/sync/engine/auth_watcher.h
diff --git a/chrome/browser/sync/engine/auth_watcher_unittest.cc b/chrome/browser/sync/engine/auth_watcher_unittest.cc
index f2adaa5..f2adaa5 100755..100644
--- a/chrome/browser/sync/engine/auth_watcher_unittest.cc
+++ b/chrome/browser/sync/engine/auth_watcher_unittest.cc
diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
index be45cdd..be45cdd 100755..100644
--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc
diff --git a/chrome/browser/sync/engine/build_commit_command.cc b/chrome/browser/sync/engine/build_commit_command.cc
index cf6b4f53..cf6b4f53 100755..100644
--- a/chrome/browser/sync/engine/build_commit_command.cc
+++ b/chrome/browser/sync/engine/build_commit_command.cc
diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
index 7bc9418..7bc9418 100755..100644
--- a/chrome/browser/sync/engine/conflict_resolver.cc
+++ b/chrome/browser/sync/engine/conflict_resolver.cc
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index b630025..b630025 100755..100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
diff --git a/chrome/browser/sync/engine/download_updates_command_unittest.cc b/chrome/browser/sync/engine/download_updates_command_unittest.cc
index f66232a..f66232a 100755..100644
--- a/chrome/browser/sync/engine/download_updates_command_unittest.cc
+++ b/chrome/browser/sync/engine/download_updates_command_unittest.cc
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.cc b/chrome/browser/sync/engine/net/gaia_authenticator.cc
index b399220..b399220 100755..100644
--- a/chrome/browser/sync/engine/net/gaia_authenticator.cc
+++ b/chrome/browser/sync/engine/net/gaia_authenticator.cc
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.h b/chrome/browser/sync/engine/net/gaia_authenticator.h
index 277354c..277354c 100755..100644
--- a/chrome/browser/sync/engine/net/gaia_authenticator.h
+++ b/chrome/browser/sync/engine/net/gaia_authenticator.h
diff --git a/chrome/browser/sync/engine/net/server_connection_manager.cc b/chrome/browser/sync/engine/net/server_connection_manager.cc
index f61622e..f61622e 100755..100644
--- a/chrome/browser/sync/engine/net/server_connection_manager.cc
+++ b/chrome/browser/sync/engine/net/server_connection_manager.cc
diff --git a/chrome/browser/sync/engine/net/server_connection_manager.h b/chrome/browser/sync/engine/net/server_connection_manager.h
index 064c64b..064c64b 100755..100644
--- a/chrome/browser/sync/engine/net/server_connection_manager.h
+++ b/chrome/browser/sync/engine/net/server_connection_manager.h
diff --git a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
index d5b387e..d5b387e 100755..100644
--- a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
+++ b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.cc
diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc
index 0db5def..0db5def 100755..100644
--- a/chrome/browser/sync/engine/process_commit_response_command.cc
+++ b/chrome/browser/sync/engine/process_commit_response_command.cc
diff --git a/chrome/browser/sync/engine/process_commit_response_command_unittest.cc b/chrome/browser/sync/engine/process_commit_response_command_unittest.cc
index 70c6732..70c6732 100755..100644
--- a/chrome/browser/sync/engine/process_commit_response_command_unittest.cc
+++ b/chrome/browser/sync/engine/process_commit_response_command_unittest.cc
diff --git a/chrome/browser/sync/engine/process_updates_command.cc b/chrome/browser/sync/engine/process_updates_command.cc
index 03af303..03af303 100755..100644
--- a/chrome/browser/sync/engine/process_updates_command.cc
+++ b/chrome/browser/sync/engine/process_updates_command.cc
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
index 7027453..7027453 100755..100644
--- a/chrome/browser/sync/engine/syncapi.cc
+++ b/chrome/browser/sync/engine/syncapi.cc
diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h
index 9fa0765..9fa0765 100755..100644
--- a/chrome/browser/sync/engine/syncapi.h
+++ b/chrome/browser/sync/engine/syncapi.h
diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc
index b89e0de..b89e0de 100755..100644
--- a/chrome/browser/sync/engine/syncapi_unittest.cc
+++ b/chrome/browser/sync/engine/syncapi_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc
index d6656b5..d6656b5 100755..100644
--- a/chrome/browser/sync/engine/syncer.cc
+++ b/chrome/browser/sync/engine/syncer.cc
diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h
index 7daed36..7daed36 100755..100644
--- a/chrome/browser/sync/engine/syncer.h
+++ b/chrome/browser/sync/engine/syncer.h
diff --git a/chrome/browser/sync/engine/syncer_proto_util.cc b/chrome/browser/sync/engine/syncer_proto_util.cc
index 4a63da6..4a63da6 100755..100644
--- a/chrome/browser/sync/engine/syncer_proto_util.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util.cc
diff --git a/chrome/browser/sync/engine/syncer_proto_util.h b/chrome/browser/sync/engine/syncer_proto_util.h
index 1422b83..1422b83 100755..100644
--- a/chrome/browser/sync/engine/syncer_proto_util.h
+++ b/chrome/browser/sync/engine/syncer_proto_util.h
diff --git a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
index 56ee0f0..56ee0f0 100755..100644
--- a/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_types.h b/chrome/browser/sync/engine/syncer_types.h
index 79c53f9..79c53f9 100755..100644
--- a/chrome/browser/sync/engine/syncer_types.h
+++ b/chrome/browser/sync/engine/syncer_types.h
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index c547106..c547106 100755..100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc
index 66fc52f..66fc52f 100755..100644
--- a/chrome/browser/sync/engine/syncer_util.cc
+++ b/chrome/browser/sync/engine/syncer_util.cc
diff --git a/chrome/browser/sync/engine/syncer_util.h b/chrome/browser/sync/engine/syncer_util.h
index 134f7b7..134f7b7 100755..100644
--- a/chrome/browser/sync/engine/syncer_util.h
+++ b/chrome/browser/sync/engine/syncer_util.h
diff --git a/chrome/browser/sync/engine/update_applicator.cc b/chrome/browser/sync/engine/update_applicator.cc
index 268de4c..268de4c 100755..100644
--- a/chrome/browser/sync/engine/update_applicator.cc
+++ b/chrome/browser/sync/engine/update_applicator.cc
diff --git a/chrome/browser/sync/engine/update_applicator.h b/chrome/browser/sync/engine/update_applicator.h
index 7a412e8..7a412e8 100755..100644
--- a/chrome/browser/sync/engine/update_applicator.h
+++ b/chrome/browser/sync/engine/update_applicator.h
diff --git a/chrome/browser/sync/engine/verify_updates_command.cc b/chrome/browser/sync/engine/verify_updates_command.cc
index 7671722..7671722 100755..100644
--- a/chrome/browser/sync/engine/verify_updates_command.cc
+++ b/chrome/browser/sync/engine/verify_updates_command.cc
diff --git a/chrome/browser/sync/glue/autofill_change_processor.cc b/chrome/browser/sync/glue/autofill_change_processor.cc
index bd561af..bd561af 100755..100644
--- a/chrome/browser/sync/glue/autofill_change_processor.cc
+++ b/chrome/browser/sync/glue/autofill_change_processor.cc
diff --git a/chrome/browser/sync/glue/autofill_change_processor.h b/chrome/browser/sync/glue/autofill_change_processor.h
index 827bcd9..827bcd9 100755..100644
--- a/chrome/browser/sync/glue/autofill_change_processor.h
+++ b/chrome/browser/sync/glue/autofill_change_processor.h
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc
index 5d72603..5d72603 100755..100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.cc
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.h b/chrome/browser/sync/glue/autofill_data_type_controller.h
index 9c73c81d..9c73c81d 100755..100644
--- a/chrome/browser/sync/glue/autofill_data_type_controller.h
+++ b/chrome/browser/sync/glue/autofill_data_type_controller.h
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
index a180d43..a180d43 100755..100644
--- a/chrome/browser/sync/glue/autofill_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc
diff --git a/chrome/browser/sync/glue/autofill_model_associator.h b/chrome/browser/sync/glue/autofill_model_associator.h
index 53de4bc..53de4bc 100755..100644
--- a/chrome/browser/sync/glue/autofill_model_associator.h
+++ b/chrome/browser/sync/glue/autofill_model_associator.h
diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc
index 37ae729..37ae729 100755..100644
--- a/chrome/browser/sync/glue/http_bridge.cc
+++ b/chrome/browser/sync/glue/http_bridge.cc
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 216544d..216544d 100755..100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc
index 1f30c38..1f30c38 100755..100644
--- a/chrome/browser/sync/glue/http_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/http_bridge_unittest.cc
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
index 14f4392..14f4392 100755..100644
--- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
+++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
index 12dfc74..12dfc74 100755..100644
--- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
+++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h
diff --git a/chrome/browser/sync/sessions/session_state.h b/chrome/browser/sync/sessions/session_state.h
index c03fe4d..c03fe4d 100755..100644
--- a/chrome/browser/sync/sessions/session_state.h
+++ b/chrome/browser/sync/sessions/session_state.h
diff --git a/chrome/browser/sync/sessions/sync_session_context.h b/chrome/browser/sync/sessions/sync_session_context.h
index 494fbdc..494fbdc 100755..100644
--- a/chrome/browser/sync/sessions/sync_session_context.h
+++ b/chrome/browser/sync/sessions/sync_session_context.h
diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc
index 85c19cd..85c19cd 100755..100644
--- a/chrome/browser/sync/sessions/sync_session_unittest.cc
+++ b/chrome/browser/sync/sessions/sync_session_unittest.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 0518367..0518367 100755..100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc
index 20c6581..20c6581 100755..100644
--- a/chrome/browser/sync/syncable/directory_backing_store.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index 70cd23c..70cd23c 100755..100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index 10ff451..10ff451 100755..100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 6a8e628..6a8e628 100755..100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
index 1bb529d..1bb529d 100755..100644
--- a/chrome/browser/sync/syncable/syncable.h
+++ b/chrome/browser/sync/syncable/syncable.h
diff --git a/chrome/browser/sync/syncable/syncable_columns.h b/chrome/browser/sync/syncable/syncable_columns.h
index 398a00f..398a00f 100755..100644
--- a/chrome/browser/sync/syncable/syncable_columns.h
+++ b/chrome/browser/sync/syncable/syncable_columns.h
diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc
index 3d514e0e..3d514e0e 100755..100644
--- a/chrome/browser/sync/syncable/syncable_unittest.cc
+++ b/chrome/browser/sync/syncable/syncable_unittest.cc
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index ddea13a..ddea13a 100755..100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc
index 4de638c..4de638c 100755..100644
--- a/chrome/browser/views/appcache_info_view.cc
+++ b/chrome/browser/views/appcache_info_view.cc
diff --git a/chrome/browser/views/appcache_info_view.h b/chrome/browser/views/appcache_info_view.h
index 25db5dd..25db5dd 100755..100644
--- a/chrome/browser/views/appcache_info_view.h
+++ b/chrome/browser/views/appcache_info_view.h
diff --git a/chrome/browser/views/database_info_view.cc b/chrome/browser/views/database_info_view.cc
index 2d9a801..2d9a801 100755..100644
--- a/chrome/browser/views/database_info_view.cc
+++ b/chrome/browser/views/database_info_view.cc
diff --git a/chrome/browser/views/database_info_view.h b/chrome/browser/views/database_info_view.h
index b6b6279..b6b6279 100755..100644
--- a/chrome/browser/views/database_info_view.h
+++ b/chrome/browser/views/database_info_view.h
diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc
index 20b315b4..20b315b4 100755..100644
--- a/chrome/browser/views/database_open_info_view.cc
+++ b/chrome/browser/views/database_open_info_view.cc
diff --git a/chrome/browser/views/database_open_info_view.h b/chrome/browser/views/database_open_info_view.h
index 84954f5..84954f5 100755..100644
--- a/chrome/browser/views/database_open_info_view.h
+++ b/chrome/browser/views/database_open_info_view.h
diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/views/frame/app_panel_browser_frame_view.cc
index e23bd0e..e23bd0e 100755..100644
--- a/chrome/browser/views/frame/app_panel_browser_frame_view.cc
+++ b/chrome/browser/views/frame/app_panel_browser_frame_view.cc
diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.h b/chrome/browser/views/frame/app_panel_browser_frame_view.h
index 0f8bd3a..0f8bd3a 100755..100644
--- a/chrome/browser/views/frame/app_panel_browser_frame_view.h
+++ b/chrome/browser/views/frame/app_panel_browser_frame_view.h
diff --git a/chrome/browser/views/local_storage_info_view.cc b/chrome/browser/views/local_storage_info_view.cc
index 21e5242..21e5242 100755..100644
--- a/chrome/browser/views/local_storage_info_view.cc
+++ b/chrome/browser/views/local_storage_info_view.cc
diff --git a/chrome/browser/views/local_storage_info_view.h b/chrome/browser/views/local_storage_info_view.h
index 83b6155..83b6155 100755..100644
--- a/chrome/browser/views/local_storage_info_view.h
+++ b/chrome/browser/views/local_storage_info_view.h
diff --git a/chrome/browser/views/local_storage_set_item_info_view.cc b/chrome/browser/views/local_storage_set_item_info_view.cc
index 699c2f5..699c2f5 100755..100644
--- a/chrome/browser/views/local_storage_set_item_info_view.cc
+++ b/chrome/browser/views/local_storage_set_item_info_view.cc
diff --git a/chrome/browser/views/local_storage_set_item_info_view.h b/chrome/browser/views/local_storage_set_item_info_view.h
index 7ab2118..7ab2118 100755..100644
--- a/chrome/browser/views/local_storage_set_item_info_view.h
+++ b/chrome/browser/views/local_storage_set_item_info_view.h
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b878687..b878687 100755..100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/icon.png b/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/icon.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/make_page_red/icon.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon1.png b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon1.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon1.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon1.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon2.png b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon2.png
index 8d3f710..8d3f710 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon2.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon2.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon3.png b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon3.png
index 2d9dec3..2d9dec3 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon3.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon3.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon4.png b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon4.png
index 896fc36..896fc36 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon4.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon4.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon5.png b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon5.png
index a5afa25..a5afa25 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon5.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_icon_path/icon5.png
diff --git a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/icon.png b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/icon.png
index 1f1c906..1f1c906 100755..100644
--- a/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/icon.png
+++ b/chrome/common/extensions/docs/examples/api/browserAction/set_page_color/icon.png
diff --git a/chrome/common/extensions/docs/examples/api/i18n/getMessage/icon.png b/chrome/common/extensions/docs/examples/api/i18n/getMessage/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/common/extensions/docs/examples/api/i18n/getMessage/icon.png
+++ b/chrome/common/extensions/docs/examples/api/i18n/getMessage/icon.png
diff --git a/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon1.png b/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon1.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon1.png
+++ b/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon1.png
diff --git a/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon2.png b/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon2.png
index 8d3f710..8d3f710 100755..100644
--- a/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon2.png
+++ b/chrome/common/extensions/docs/examples/api/pageAction/set_icon/icon2.png
diff --git a/chrome/common/extensions/docs/examples/api/tabs/screenshot/camera.png b/chrome/common/extensions/docs/examples/api/tabs/screenshot/camera.png
index be26c39..be26c39 100755..100644
--- a/chrome/common/extensions/docs/examples/api/tabs/screenshot/camera.png
+++ b/chrome/common/extensions/docs/examples/api/tabs/screenshot/camera.png
diff --git a/chrome/common/extensions/docs/examples/api/windows/merge_windows/arrow_in.png b/chrome/common/extensions/docs/examples/api/windows/merge_windows/arrow_in.png
index 745c651..745c651 100755..100644
--- a/chrome/common/extensions/docs/examples/api/windows/merge_windows/arrow_in.png
+++ b/chrome/common/extensions/docs/examples/api/windows/merge_windows/arrow_in.png
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/chromium.png b/chrome/common/extensions/docs/examples/extensions/buildbot/chromium.png
index cc9fb60..cc9fb60 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/chromium.png
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/chromium.png
diff --git a/chrome/common/extensions/docs/examples/extensions/buildbot/icon.png b/chrome/common/extensions/docs/examples/extensions/buildbot/icon.png
index b3c3474..b3c3474 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/buildbot/icon.png
+++ b/chrome/common/extensions/docs/examples/extensions/buildbot/icon.png
diff --git a/chrome/common/extensions/docs/examples/extensions/gmail/icon_128.png b/chrome/common/extensions/docs/examples/extensions/gmail/icon_128.png
index 1ddc33b..1ddc33b 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/gmail/icon_128.png
+++ b/chrome/common/extensions/docs/examples/extensions/gmail/icon_128.png
diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/icon.png b/chrome/common/extensions/docs/examples/extensions/mappy/icon.png
index 40ebbff..40ebbff 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/mappy/icon.png
+++ b/chrome/common/extensions/docs/examples/extensions/mappy/icon.png
diff --git a/chrome/common/extensions/docs/examples/extensions/mappy/marker.png b/chrome/common/extensions/docs/examples/extensions/mappy/marker.png
index 3aa768b..3aa768b 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/mappy/marker.png
+++ b/chrome/common/extensions/docs/examples/extensions/mappy/marker.png
diff --git a/chrome/common/extensions/docs/examples/extensions/news/news_action.png b/chrome/common/extensions/docs/examples/extensions/news/news_action.png
index 24b0ca7..24b0ca7 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/news/news_action.png
+++ b/chrome/common/extensions/docs/examples/extensions/news/news_action.png
diff --git a/chrome/common/extensions/docs/examples/extensions/news/news_icon.png b/chrome/common/extensions/docs/examples/extensions/news/news_icon.png
index 42da406..42da406 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/news/news_icon.png
+++ b/chrome/common/extensions/docs/examples/extensions/news/news_icon.png
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/news_action.png b/chrome/common/extensions/docs/examples/extensions/news_i18n/news_action.png
index 24b0ca7..24b0ca7 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/news_action.png
+++ b/chrome/common/extensions/docs/examples/extensions/news_i18n/news_action.png
diff --git a/chrome/common/extensions/docs/examples/extensions/news_i18n/news_icon.png b/chrome/common/extensions/docs/examples/extensions/news_i18n/news_icon.png
index 42da406..42da406 100755..100644
--- a/chrome/common/extensions/docs/examples/extensions/news_i18n/news_icon.png
+++ b/chrome/common/extensions/docs/examples/extensions/news_i18n/news_icon.png
diff --git a/chrome/common/extensions/docs/examples/tutorials/getstarted/icon.png b/chrome/common/extensions/docs/examples/tutorials/getstarted/icon.png
index 103ff36..103ff36 100755..100644
--- a/chrome/common/extensions/docs/examples/tutorials/getstarted/icon.png
+++ b/chrome/common/extensions/docs/examples/tutorials/getstarted/icon.png
diff --git a/chrome/common/extensions/docs/images/icon.png b/chrome/common/extensions/docs/images/icon.png
index d3d3a71..d3d3a71 100755..100644
--- a/chrome/common/extensions/docs/images/icon.png
+++ b/chrome/common/extensions/docs/images/icon.png
diff --git a/chrome/common/extensions/docs/images/index/gmail.png b/chrome/common/extensions/docs/images/index/gmail.png
index 5551b15..5551b15 100755..100644
--- a/chrome/common/extensions/docs/images/index/gmail.png
+++ b/chrome/common/extensions/docs/images/index/gmail.png
diff --git a/chrome/common/extensions/docs/images/index/news.png b/chrome/common/extensions/docs/images/index/news.png
index 410a344..410a344 100755..100644
--- a/chrome/common/extensions/docs/images/index/news.png
+++ b/chrome/common/extensions/docs/images/index/news.png
diff --git a/chrome/common/extensions/docs/images/index/rss.png b/chrome/common/extensions/docs/images/index/rss.png
index f8d2fc4..f8d2fc4 100755..100644
--- a/chrome/common/extensions/docs/images/index/rss.png
+++ b/chrome/common/extensions/docs/images/index/rss.png
diff --git a/chrome/common/extensions/docs/images/intermediate/bookmarks.png b/chrome/common/extensions/docs/images/intermediate/bookmarks.png
index 142fa08..142fa08 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/bookmarks.png
+++ b/chrome/common/extensions/docs/images/intermediate/bookmarks.png
diff --git a/chrome/common/extensions/docs/images/intermediate/hello-world.png b/chrome/common/extensions/docs/images/intermediate/hello-world.png
index c2d0ddf..c2d0ddf 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/hello-world.png
+++ b/chrome/common/extensions/docs/images/intermediate/hello-world.png
diff --git a/chrome/common/extensions/docs/images/intermediate/tabs.png b/chrome/common/extensions/docs/images/intermediate/tabs.png
index ab506e6..ab506e6 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/tabs.png
+++ b/chrome/common/extensions/docs/images/intermediate/tabs.png
diff --git a/chrome/common/extensions/docs/images/intermediate/themes-1.jpg b/chrome/common/extensions/docs/images/intermediate/themes-1.jpg
index b0acce3..b0acce3 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/themes-1.jpg
+++ b/chrome/common/extensions/docs/images/intermediate/themes-1.jpg
diff --git a/chrome/common/extensions/docs/images/intermediate/themes-2.jpg b/chrome/common/extensions/docs/images/intermediate/themes-2.jpg
index baefdc3..baefdc3 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/themes-2.jpg
+++ b/chrome/common/extensions/docs/images/intermediate/themes-2.jpg
diff --git a/chrome/common/extensions/docs/images/intermediate/themes-3.jpg b/chrome/common/extensions/docs/images/intermediate/themes-3.jpg
index dc1b826..dc1b826 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/themes-3.jpg
+++ b/chrome/common/extensions/docs/images/intermediate/themes-3.jpg
diff --git a/chrome/common/extensions/docs/images/intermediate/windows.png b/chrome/common/extensions/docs/images/intermediate/windows.png
index a0279a9..a0279a9 100755..100644
--- a/chrome/common/extensions/docs/images/intermediate/windows.png
+++ b/chrome/common/extensions/docs/images/intermediate/windows.png
diff --git a/chrome/common/extensions/docs/images/tabs.png b/chrome/common/extensions/docs/images/tabs.png
index 781ae26..781ae26 100755..100644
--- a/chrome/common/extensions/docs/images/tabs.png
+++ b/chrome/common/extensions/docs/images/tabs.png
diff --git a/chrome/common/extensions/docs/images/windows.png b/chrome/common/extensions/docs/images/windows.png
index c54b182..c54b182 100755..100644
--- a/chrome/common/extensions/docs/images/windows.png
+++ b/chrome/common/extensions/docs/images/windows.png
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 963c4b96..963c4b96 100755..100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
diff --git a/chrome/common/extensions/extension_action.h b/chrome/common/extensions/extension_action.h
index 9fbbff4..9fbbff4 100755..100644
--- a/chrome/common/extensions/extension_action.h
+++ b/chrome/common/extensions/extension_action.h
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index afc7805..afc7805 100755..100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
diff --git a/chrome/installer/util/installer_util_unittests_resource.h b/chrome/installer/util/installer_util_unittests_resource.h
index 89f6f89..d66d62f 100644
--- a/chrome/installer/util/installer_util_unittests_resource.h
+++ b/chrome/installer/util/installer_util_unittests_resource.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-

-//{{NO_DEPENDENCIES}}

-// Microsoft Visual C++ generated include file.

-// Used by installer_util_unittests.rc

-

-// Next default values for new objects

-// 

-#ifdef APSTUDIO_INVOKED

-#ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        101

-#define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1001

-#define _APS_NEXT_SYMED_VALUE           101

-#endif

-#endif

+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by installer_util_unittests.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/chrome/test/data/extensions/api_test/browser_action/add_popup/icon.png b/chrome/test/data/extensions/api_test/browser_action/add_popup/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/add_popup/icon.png
+++ b/chrome/test/data/extensions/api_test/browser_action/add_popup/icon.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/basics/icon.png b/chrome/test/data/extensions/api_test/browser_action/basics/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/basics/icon.png
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/icon.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png b/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png b/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png
index cc9fb60..cc9fb60 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/remove_popup/icon.png b/chrome/test/data/extensions/api_test/browser_action/remove_popup/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/remove_popup/icon.png
+++ b/chrome/test/data/extensions/api_test/browser_action/remove_popup/icon.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png
index 8d3f710..8d3f710 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png
index 2d9dec3..2d9dec3 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png
index 896fc36..896fc36 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png
index a5afa25..a5afa25 100755..100644
--- a/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png
diff --git a/chrome/test/data/extensions/api_test/page_action/add_popup/icon.png b/chrome/test/data/extensions/api_test/page_action/add_popup/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/page_action/add_popup/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/add_popup/icon.png
diff --git a/chrome/test/data/extensions/api_test/page_action/basics/icon.png b/chrome/test/data/extensions/api_test/page_action/basics/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/page_action/basics/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/basics/icon.png
diff --git a/chrome/test/data/extensions/api_test/page_action/popup/icon.png b/chrome/test/data/extensions/api_test/page_action/popup/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/page_action/popup/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/popup/icon.png
diff --git a/chrome/test/data/extensions/api_test/page_action/remove_popup/icon.png b/chrome/test/data/extensions/api_test/page_action/remove_popup/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/page_action/remove_popup/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/remove_popup/icon.png
diff --git a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/icon_128.png b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/icon_128.png
index af4b817..af4b817 100755..100644
--- a/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/icon_128.png
+++ b/chrome/test/data/extensions/good/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/icon_128.png
diff --git a/chrome/test/data/extensions/icon_size_test/icon.png b/chrome/test/data/extensions/icon_size_test/icon.png
index c791499..c791499 100755..100644
--- a/chrome/test/data/extensions/icon_size_test/icon.png
+++ b/chrome/test/data/extensions/icon_size_test/icon.png
diff --git a/chrome/test/data/extensions/subscribe_page_action/feed-icon-128x128.png b/chrome/test/data/extensions/subscribe_page_action/feed-icon-128x128.png
index 7c4d19f..7c4d19f 100755..100644
--- a/chrome/test/data/extensions/subscribe_page_action/feed-icon-128x128.png
+++ b/chrome/test/data/extensions/subscribe_page_action/feed-icon-128x128.png
diff --git a/chrome/test/sync/engine/mock_server_connection.cc b/chrome/test/sync/engine/mock_server_connection.cc
index ce3b03d..ce3b03d 100755..100644
--- a/chrome/test/sync/engine/mock_server_connection.cc
+++ b/chrome/test/sync/engine/mock_server_connection.cc
diff --git a/chrome/test/sync/engine/mock_server_connection.h b/chrome/test/sync/engine/mock_server_connection.h
index dc9af6f..dc9af6f 100755..100644
--- a/chrome/test/sync/engine/mock_server_connection.h
+++ b/chrome/test/sync/engine/mock_server_connection.h
diff --git a/chrome/test/sync/engine/proto_extension_validator.h b/chrome/test/sync/engine/proto_extension_validator.h
index b4246d7..b4246d7 100755..100644
--- a/chrome/test/sync/engine/proto_extension_validator.h
+++ b/chrome/test/sync/engine/proto_extension_validator.h
diff --git a/chrome/test/sync/engine/syncer_command_test.h b/chrome/test/sync/engine/syncer_command_test.h
index a8814ac..a8814ac 100755..100644
--- a/chrome/test/sync/engine/syncer_command_test.h
+++ b/chrome/test/sync/engine/syncer_command_test.h
diff --git a/chrome/test/sync/engine/test_directory_setter_upper.cc b/chrome/test/sync/engine/test_directory_setter_upper.cc
index 906370c..906370c 100755..100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.cc
+++ b/chrome/test/sync/engine/test_directory_setter_upper.cc
diff --git a/chrome/test/sync/engine/test_directory_setter_upper.h b/chrome/test/sync/engine/test_directory_setter_upper.h
index 0cb3bd6a..0cb3bd6a 100755..100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.h
+++ b/chrome/test/sync/engine/test_directory_setter_upper.h
diff --git a/chrome/test/sync/engine/test_syncable_utils.cc b/chrome/test/sync/engine/test_syncable_utils.cc
index 12e5b05..12e5b05 100755..100644
--- a/chrome/test/sync/engine/test_syncable_utils.cc
+++ b/chrome/test/sync/engine/test_syncable_utils.cc
diff --git a/chrome/test/sync/engine/test_syncable_utils.h b/chrome/test/sync/engine/test_syncable_utils.h
index 05cecb6..05cecb6 100755..100644
--- a/chrome/test/sync/engine/test_syncable_utils.h
+++ b/chrome/test/sync/engine/test_syncable_utils.h
diff --git a/chrome/test/sync/test_http_bridge_factory.h b/chrome/test/sync/test_http_bridge_factory.h
index a9fc0b4..a9fc0b4 100755..100644
--- a/chrome/test/sync/test_http_bridge_factory.h
+++ b/chrome/test/sync/test_http_bridge_factory.h
diff --git a/chrome_frame/test/perf/silverlight.cc b/chrome_frame/test/perf/silverlight.cc
index 3016c2b..d5d95df 100644
--- a/chrome_frame/test/perf/silverlight.cc
+++ b/chrome_frame/test/perf/silverlight.cc
@@ -1,165 +1,165 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-#include <atlbase.h>

-#include <atlwin.h>

-#include <atlhost.h>

-#include "base/scoped_comptr_win.h"

-#include "chrome_frame/test/perf/chrome_frame_perftest.h"

-

-interface IXcpControlDownloadCallback;

-interface __declspec(uuid("1B36028E-B491-4bb2-8584-8A9E0A677D6E"))

-IXcpControlHost : public IUnknown {

-  typedef enum {

-    XcpHostOption_FreezeOnInitialFrame       = 0x001,

-    XcpHostOption_DisableFullScreen          = 0x002,

-    XcpHostOption_DisableManagedExecution    = 0x008,

-    XcpHostOption_EnableCrossDomainDownloads = 0x010,

-    XcpHostOption_UseCustomAppDomain         = 0x020,

-    XcpHostOption_DisableNetworking          = 0x040,

-    XcpHostOption_DisableScriptCallouts      = 0x080,

-    XcpHostOption_EnableHtmlDomAccess        = 0x100,

-    XcpHostOption_EnableScriptableObjectAccess = 0x200,

-  } XcpHostOptions;

-

-  STDMETHOD(GetHostOptions)(DWORD* pdwOptions) PURE;

-  STDMETHOD(NotifyLoaded()) PURE;

-  STDMETHOD(NotifyError)(BSTR bstrError, BSTR bstrSource,

-      long nLine, long nColumn) PURE;

-  STDMETHOD(InvokeHandler)(BSTR bstrName, VARIANT varArg1, VARIANT varArg2,

-      VARIANT* pvarResult) PURE;

-  STDMETHOD(GetBaseUrl)(BSTR* pbstrUrl) PURE;

-  STDMETHOD(GetNamedSource)(BSTR bstrSourceName, BSTR* pbstrSource) PURE;

-  STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback,

-      IStream** ppStream) PURE;

-};

-

-// Not templatized, to trade execution speed vs typing

-class IXcpControlHostImpl : public IXcpControlHost {

- public:

-  STDMETHOD(GetHostOptions)(DWORD* pdwOptions) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(NotifyLoaded()) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(NotifyError)(BSTR bstrError, BSTR bstrSource,

-                         long nLine, long nColumn) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(InvokeHandler)(BSTR bstrName, VARIANT varArg1, VARIANT varArg2,

-                           VARIANT* pvarResult) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(GetBaseUrl)(BSTR* pbstrUrl) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(GetNamedSource)(BSTR bstrSourceName, BSTR* pbstrSource) {

-    return E_NOTIMPL;

-  }

-

-  STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback,

-                         IStream** ppStream) {

-    return E_NOTIMPL;

-  }

-};

-

-// Silverlight container. Supports do-nothing implementation of IXcpControlHost.

-// Should be extended to do some real movie-or-something download.

-class SilverlightContainer :

-    public IServiceProviderImpl<SilverlightContainer>,

-    public IXcpControlHostImpl,

-    public CWindowImpl<SilverlightContainer, CWindow, CWinTraits<

-        WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,

-        WS_EX_APPWINDOW | WS_EX_WINDOWEDGE> >,

-    public CComObjectRootEx<CComSingleThreadModel> {

- public:

-  DECLARE_WND_CLASS_EX(L"Silverlight_container", 0, 0)

-  BEGIN_COM_MAP(SilverlightContainer)

-    COM_INTERFACE_ENTRY(IServiceProvider)

-    COM_INTERFACE_ENTRY(IXcpControlHost)

-  END_COM_MAP()

-

-  BEGIN_SERVICE_MAP(SilverlightContainer)

-    SERVICE_ENTRY(__uuidof(IXcpControlHost))

-  END_SERVICE_MAP()

-

-  BEGIN_MSG_MAP(ChromeFrameActiveXContainer)

-    MESSAGE_HANDLER(WM_DESTROY, OnDestroy)

-  END_MSG_MAP()

-

-  LRESULT OnDestroy(UINT, WPARAM, LPARAM, BOOL& handled) {

-    host_.Release();

-    return 0;

-  }

-

-  virtual void OnFinalMessage(HWND ) {

-  }

-

-  static const wchar_t* GetWndCaption() {

-    return L"Silverlight Container";

-  }

-

-  HRESULT CreateWndAndHost(RECT* r) {

-    Create(NULL, r);

-    ShowWindow(SW_SHOWDEFAULT);

-

-    CComPtr<IUnknown> spUnkContainer;

-    HRESULT hr = CAxHostWindow::_CreatorClass::CreateInstance(NULL,

-        __uuidof(IAxWinHostWindow), reinterpret_cast<void**>(&host_));

-    if (SUCCEEDED(hr)) {

-      CComPtr<IObjectWithSite> p;

-      hr = host_.QueryInterface(&p);

-      if (SUCCEEDED(hr)) {

-        p->SetSite(GetUnknown());

-      }

-    }

-    return hr;

-  }

-

-  HRESULT CreateControl() {

-    HRESULT hr = host_->CreateControl(L"AgControl.AgControl", m_hWnd, NULL);

-    EXPECT_HRESULT_SUCCEEDED(hr);

-    return hr;

-  }

-

-  ScopedComPtr<IAxWinHostWindow> host_;

-};

-

-// Create and in-place Silverlight control. Should be extended to do something

-// more meaningful.

-TEST(ChromeFramePerf, DISABLED_HostSilverlight2) {

-  SimpleModule module;

-  AtlAxWinInit();

-  CComObjectStackEx<SilverlightContainer> wnd;

-  RECT rc = {0, 0, 800, 600};

-  wnd.CreateWndAndHost(&rc);

-  PerfTimeLogger perf_create("Create Silverlight Control2");

-  wnd.CreateControl();

-  perf_create.Done();

-  wnd.DestroyWindow();

-}

-

-// Simplest test - creates in-place Silverlight control.

-TEST(ChromeFramePerf, DISABLED_HostSilverlight) {

-  SimpleModule module;

-  AtlAxWinInit();

-  CAxWindow host;

-  RECT rc = {0, 0, 800, 600};

-  PerfTimeLogger perf_create("Create Silverlight Control");

-  host.Create(NULL, rc, L"AgControl.AgControl",

-      WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,

-      WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);

-  EXPECT_TRUE(host.m_hWnd != NULL);

-  ScopedComPtr<IDispatch> disp;

-  HRESULT hr = host.QueryControl(disp.Receive());

-  EXPECT_HRESULT_SUCCEEDED(hr);

-  disp.Release();

-  perf_create.Done();

-}

-

+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#include <atlbase.h>
+#include <atlwin.h>
+#include <atlhost.h>
+#include "base/scoped_comptr_win.h"
+#include "chrome_frame/test/perf/chrome_frame_perftest.h"
+
+interface IXcpControlDownloadCallback;
+interface __declspec(uuid("1B36028E-B491-4bb2-8584-8A9E0A677D6E"))
+IXcpControlHost : public IUnknown {
+  typedef enum {
+    XcpHostOption_FreezeOnInitialFrame       = 0x001,
+    XcpHostOption_DisableFullScreen          = 0x002,
+    XcpHostOption_DisableManagedExecution    = 0x008,
+    XcpHostOption_EnableCrossDomainDownloads = 0x010,
+    XcpHostOption_UseCustomAppDomain         = 0x020,
+    XcpHostOption_DisableNetworking          = 0x040,
+    XcpHostOption_DisableScriptCallouts      = 0x080,
+    XcpHostOption_EnableHtmlDomAccess        = 0x100,
+    XcpHostOption_EnableScriptableObjectAccess = 0x200,
+  } XcpHostOptions;
+
+  STDMETHOD(GetHostOptions)(DWORD* pdwOptions) PURE;
+  STDMETHOD(NotifyLoaded()) PURE;
+  STDMETHOD(NotifyError)(BSTR bstrError, BSTR bstrSource,
+      long nLine, long nColumn) PURE;
+  STDMETHOD(InvokeHandler)(BSTR bstrName, VARIANT varArg1, VARIANT varArg2,
+      VARIANT* pvarResult) PURE;
+  STDMETHOD(GetBaseUrl)(BSTR* pbstrUrl) PURE;
+  STDMETHOD(GetNamedSource)(BSTR bstrSourceName, BSTR* pbstrSource) PURE;
+  STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback,
+      IStream** ppStream) PURE;
+};
+
+// Not templatized, to trade execution speed vs typing
+class IXcpControlHostImpl : public IXcpControlHost {
+ public:
+  STDMETHOD(GetHostOptions)(DWORD* pdwOptions) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(NotifyLoaded()) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(NotifyError)(BSTR bstrError, BSTR bstrSource,
+                         long nLine, long nColumn) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(InvokeHandler)(BSTR bstrName, VARIANT varArg1, VARIANT varArg2,
+                           VARIANT* pvarResult) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(GetBaseUrl)(BSTR* pbstrUrl) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(GetNamedSource)(BSTR bstrSourceName, BSTR* pbstrSource) {
+    return E_NOTIMPL;
+  }
+
+  STDMETHOD(DownloadUrl)(BSTR bstrUrl, IXcpControlDownloadCallback* pCallback,
+                         IStream** ppStream) {
+    return E_NOTIMPL;
+  }
+};
+
+// Silverlight container. Supports do-nothing implementation of IXcpControlHost.
+// Should be extended to do some real movie-or-something download.
+class SilverlightContainer :
+    public IServiceProviderImpl<SilverlightContainer>,
+    public IXcpControlHostImpl,
+    public CWindowImpl<SilverlightContainer, CWindow, CWinTraits<
+        WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+        WS_EX_APPWINDOW | WS_EX_WINDOWEDGE> >,
+    public CComObjectRootEx<CComSingleThreadModel> {
+ public:
+  DECLARE_WND_CLASS_EX(L"Silverlight_container", 0, 0)
+  BEGIN_COM_MAP(SilverlightContainer)
+    COM_INTERFACE_ENTRY(IServiceProvider)
+    COM_INTERFACE_ENTRY(IXcpControlHost)
+  END_COM_MAP()
+
+  BEGIN_SERVICE_MAP(SilverlightContainer)
+    SERVICE_ENTRY(__uuidof(IXcpControlHost))
+  END_SERVICE_MAP()
+
+  BEGIN_MSG_MAP(ChromeFrameActiveXContainer)
+    MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
+  END_MSG_MAP()
+
+  LRESULT OnDestroy(UINT, WPARAM, LPARAM, BOOL& handled) {
+    host_.Release();
+    return 0;
+  }
+
+  virtual void OnFinalMessage(HWND ) {
+  }
+
+  static const wchar_t* GetWndCaption() {
+    return L"Silverlight Container";
+  }
+
+  HRESULT CreateWndAndHost(RECT* r) {
+    Create(NULL, r);
+    ShowWindow(SW_SHOWDEFAULT);
+
+    CComPtr<IUnknown> spUnkContainer;
+    HRESULT hr = CAxHostWindow::_CreatorClass::CreateInstance(NULL,
+        __uuidof(IAxWinHostWindow), reinterpret_cast<void**>(&host_));
+    if (SUCCEEDED(hr)) {
+      CComPtr<IObjectWithSite> p;
+      hr = host_.QueryInterface(&p);
+      if (SUCCEEDED(hr)) {
+        p->SetSite(GetUnknown());
+      }
+    }
+    return hr;
+  }
+
+  HRESULT CreateControl() {
+    HRESULT hr = host_->CreateControl(L"AgControl.AgControl", m_hWnd, NULL);
+    EXPECT_HRESULT_SUCCEEDED(hr);
+    return hr;
+  }
+
+  ScopedComPtr<IAxWinHostWindow> host_;
+};
+
+// Create and in-place Silverlight control. Should be extended to do something
+// more meaningful.
+TEST(ChromeFramePerf, DISABLED_HostSilverlight2) {
+  SimpleModule module;
+  AtlAxWinInit();
+  CComObjectStackEx<SilverlightContainer> wnd;
+  RECT rc = {0, 0, 800, 600};
+  wnd.CreateWndAndHost(&rc);
+  PerfTimeLogger perf_create("Create Silverlight Control2");
+  wnd.CreateControl();
+  perf_create.Done();
+  wnd.DestroyWindow();
+}
+
+// Simplest test - creates in-place Silverlight control.
+TEST(ChromeFramePerf, DISABLED_HostSilverlight) {
+  SimpleModule module;
+  AtlAxWinInit();
+  CAxWindow host;
+  RECT rc = {0, 0, 800, 600};
+  PerfTimeLogger perf_create("Create Silverlight Control");
+  host.Create(NULL, rc, L"AgControl.AgControl",
+      WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+      WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
+  EXPECT_TRUE(host.m_hWnd != NULL);
+  ScopedComPtr<IDispatch> disp;
+  HRESULT hr = host.QueryControl(disp.Receive());
+  EXPECT_HRESULT_SUCCEEDED(hr);
+  disp.Release();
+  perf_create.Done();
+}
+
diff --git a/gears/gears.gyp b/gears/gears.gyp
index aeafb22..aeafb22 100755..100644
--- a/gears/gears.gyp
+++ b/gears/gears.gyp
diff --git a/net/tools/fetch/http_server.h b/net/tools/fetch/http_server.h
index 6b8e719..67d1ef5 100644
--- a/net/tools/fetch/http_server.h
+++ b/net/tools/fetch/http_server.h
@@ -1,25 +1,25 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-

-#ifndef NET_BASE_TOOLS_HTTP_SERVER_H_

-#define NET_BASE_TOOLS_HTTP_SERVER_H_

-

-#include "base/basictypes.h"

-#include "net/tools/fetch/http_session.h"

-

-// Implements a simple, single-threaded HttpServer.

-// Right now, this class implements no functionality above and beyond

-// the HttpSession.

-class HttpServer {

-public:

-  HttpServer(std::string ip, int port);

-  ~HttpServer();

-

-private:

-  scoped_ptr<HttpSession> session_;

-  DISALLOW_EVIL_CONSTRUCTORS(HttpServer);

-};

-

-#endif // NET_BASE_TOOLS_HTTP_SERVER_H_

-

+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef NET_BASE_TOOLS_HTTP_SERVER_H_
+#define NET_BASE_TOOLS_HTTP_SERVER_H_
+
+#include "base/basictypes.h"
+#include "net/tools/fetch/http_session.h"
+
+// Implements a simple, single-threaded HttpServer.
+// Right now, this class implements no functionality above and beyond
+// the HttpSession.
+class HttpServer {
+public:
+  HttpServer(std::string ip, int port);
+  ~HttpServer();
+
+private:
+  scoped_ptr<HttpSession> session_;
+  DISALLOW_EVIL_CONSTRUCTORS(HttpServer);
+};
+
+#endif // NET_BASE_TOOLS_HTTP_SERVER_H_
+
diff --git a/net/tools/fetch/http_server_request_info.h b/net/tools/fetch/http_server_request_info.h
index 7af161f..239d3b9 100644
--- a/net/tools/fetch/http_server_request_info.h
+++ b/net/tools/fetch/http_server_request_info.h
@@ -1,24 +1,24 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-

-#ifndef NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

-#define NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

-

-#include <string>

-

-#include "net/http/http_request_info.h"

-

-// Meta information about an HTTP request.

-// This is geared toward servers in that it keeps a map of the headers and

-// values rather than just a list of header strings (which net::HttpRequestInfo

-// does).

-class HttpServerRequestInfo : public net::HttpRequestInfo {

- public:

-  HttpServerRequestInfo() : net::HttpRequestInfo() {}

-

-  // A map of the names -> values for HTTP headers.

-  std::map<std::string, std::string> headers;

-};

-

-#endif  // NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_

+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_
+#define NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_
+
+#include <string>
+
+#include "net/http/http_request_info.h"
+
+// Meta information about an HTTP request.
+// This is geared toward servers in that it keeps a map of the headers and
+// values rather than just a list of header strings (which net::HttpRequestInfo
+// does).
+class HttpServerRequestInfo : public net::HttpRequestInfo {
+ public:
+  HttpServerRequestInfo() : net::HttpRequestInfo() {}
+
+  // A map of the names -> values for HTTP headers.
+  std::map<std::string, std::string> headers;
+};
+
+#endif  // NET_BASE_TOOLS_HTTP_SERVER_REQUEST_INFO_H_
diff --git a/skia/ext/platform_canvas_win.h b/skia/ext/platform_canvas_win.h
index 8559bd4..9f2cc53 100644
--- a/skia/ext/platform_canvas_win.h
+++ b/skia/ext/platform_canvas_win.h
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-

-

-// TODO(brettw) erase this file. This file is necessary because

-// FontChromiumWin.cpp in WebKit includes it, and I want to avoid having to

-// synchronize the checkins to Chromium and WebKit.

-

-#include "skia/ext/platform_canvas.h"

+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+
+// TODO(brettw) erase this file. This file is necessary because
+// FontChromiumWin.cpp in WebKit includes it, and I want to avoid having to
+// synchronize the checkins to Chromium and WebKit.
+
+#include "skia/ext/platform_canvas.h"
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 3184745..3184745 100755..100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
diff --git a/views/controls/label.cc b/views/controls/label.cc
index f6f25d1..f6f25d1 100755..100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
diff --git a/views/widget/widget_delegate.h b/views/widget/widget_delegate.h
index 4607376..4607376 100755..100644
--- a/views/widget/widget_delegate.h
+++ b/views/widget/widget_delegate.h
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/delete-br-013-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/delete-br-013-expected.png
index 24e37eb..24e37eb 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/delete-br-013-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/deleting/delete-br-013-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png
index f077e0c..b3b2e15 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/selectAll-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
index d9ca618..d9ca618 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/clip/overflow-border-radius-clip-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/clip/overflow-border-radius-clip-expected.png
index 24e5c8f..24e5c8f 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/clip/overflow-border-radius-clip-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/clip/overflow-border-radius-clip-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/block-no-inflow-children-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
index 3dc4d81..3dc4d81 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/block-no-inflow-children-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
index 5e75ab2..5e75ab2 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
index af146af..af146af 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
index 5700fb5..5700fb5 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-013-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-013-expected.png
index 45f6999..45f6999 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-013-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-br-013-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
index b8374d9..b8374d9 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
index 7f7fff5..7f7fff5 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
index 29b71be..29b71be 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/block-no-inflow-children-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
index a0ed35e..a0ed35e 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/block-no-inflow-children-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/mac/fast/forms/input-list-button-size-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/mac/fast/forms/input-list-button-size-expected.png
index f574f48..f574f48 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/mac/fast/forms/input-list-button-size-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/mac/fast/forms/input-list-button-size-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/qt/fast/events/event-sender-keydown-frame-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/qt/fast/events/event-sender-keydown-frame-expected.png
index ff2ef75..ff2ef75 100755..100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/qt/fast/events/event-sender-keydown-frame-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/platform/qt/fast/events/event-sender-keydown-frame-expected.png
diff --git a/webkit/glue/resources/media_slider_thumb.png b/webkit/glue/resources/media_slider_thumb.png
index 21909ce..21909ce 100755..100644
--- a/webkit/glue/resources/media_slider_thumb.png
+++ b/webkit/glue/resources/media_slider_thumb.png
diff --git a/webkit/glue/resources/media_volume_slider_thumb.png b/webkit/glue/resources/media_volume_slider_thumb.png
index 4789937..4789937 100755..100644
--- a/webkit/glue/resources/media_volume_slider_thumb.png
+++ b/webkit/glue/resources/media_volume_slider_thumb.png