21a33e9 - platform/external/chromium_org

commit	21a33e99a57b647a2fc21a938f2d8d15d2945a93	[log] [tgz]
author	Torne (Richard Coles) <torne@google.com>	Fri Sep 19 12:02:38 2014 +0100
committer	Torne (Richard Coles) <torne@google.com>	Fri Sep 19 12:02:38 2014 +0100
tree	aed7f19b307e596c720004ca56ac78c61ee25cee
parent	ce087a03836c21202ee565ab0427f57c17da1c35 [diff]

Merge from Chromium at DEPS revision 38.0.2125.69

This commit was generated by merge_to_master.py.

Change-Id: Ic126b8244c70faf0de8c5d113d9b7f032d191b23

android_webview/browser/aw_contents_client_bridge_base.cc[diff]
android_webview/browser/aw_contents_client_bridge_base.h[diff]
android_webview/browser/aw_javascript_dialog_manager.cc[diff]
android_webview/browser/browser_view_renderer.cc[diff]
android_webview/browser/global_tile_manager.h[diff]
android_webview/browser/global_tile_manager_unittest.cc[diff]
android_webview/browser/hardware_renderer.cc[diff]
android_webview/java/src/org/chromium/android_webview/AwAssets.java[diff]
android_webview/java/src/org/chromium/android_webview/AwContents.java[diff]
android_webview/native/aw_contents.cc[diff]
android_webview/native/aw_contents_client_bridge.cc[diff]
ash/display/display_controller.cc[diff]
ash/display/mirror_window_controller.cc[diff]
ash/shelf/shelf_util.cc[diff]
ash/shelf/shelf_util.h[diff]
ash/system/web_notification/ash_popup_alignment_delegate.cc[diff]
ash/wm/ash_native_cursor_manager.cc[diff]
ash/wm/ash_native_cursor_manager_unittest.cc[diff]
base/android/java/src/org/chromium/base/ContentUriUtils.java[diff]
base/message_loop/incoming_task_queue.cc[diff]
base/message_loop/incoming_task_queue.h[diff]
base/message_loop/message_loop.cc[diff]
base/message_loop/message_loop.h[diff]
base/message_loop/message_loop_unittest.cc[diff]
base/message_loop/message_pump.h[diff]
base/pending_task.cc[diff]
base/pending_task.h[diff]
base/time/time.h[diff]
base/time/time_win.cc[diff]
base/timer/hi_res_timer_manager_unittest.cc[diff]
build/util/LASTCHANGE[diff]
build/util/LASTCHANGE.blink[diff]
cc/base/tiling_data.cc[diff]
cc/base/tiling_data.h[diff]
cc/base/tiling_data_unittest.cc[diff]
cc/layers/picture_layer.cc[diff]
cc/layers/picture_layer_impl.cc[diff]
cc/layers/picture_layer_impl.h[diff]
cc/layers/picture_layer_impl_unittest.cc[diff]
cc/resources/picture_layer_tiling.cc[diff]
cc/resources/picture_layer_tiling.h[diff]
cc/resources/picture_layer_tiling_unittest.cc[diff]
cc/resources/picture_pile.cc[diff]
cc/resources/picture_pile_base.cc[diff]
cc/resources/picture_pile_base.h[diff]
cc/resources/picture_pile_unittest.cc[diff]
cc/test/fake_picture_layer_impl.h[diff]
cc/test/fake_picture_layer_tiling_client.cc[diff]
cc/test/fake_picture_layer_tiling_client.h[diff]
cc/trees/layer_tree_host_impl.cc[diff]
cc/trees/layer_tree_host_impl.h[diff]
cc/trees/layer_tree_impl.cc[diff]
cc/trees/layer_tree_impl.h[diff]
cc/trees/thread_proxy.cc[diff]
chrome/VERSION[diff]
chrome/android/java/src/org/chromium/chrome/browser/FileProviderHelper.java[Added - diff]
chrome/android/java/src/org/chromium/chrome/browser/profiles/Profile.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java[diff]
chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java[diff]
chrome/android/shell/java/AndroidManifest.xml[diff]
chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java[diff]
chrome/android/shell/res/xml/file_paths.xml[Added - diff]
chrome/browser/android/dev_tools_server.cc[diff]
chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc[diff]
chrome/browser/autofill/autofill_server_browsertest.cc[diff]
chrome/browser/chrome_browser_main.cc[diff]
chrome/browser/chromeos/events/event_rewriter_unittest.cc[diff]
chrome/browser/chromeos/login/existing_user_controller.cc[diff]
chrome/browser/chromeos/system/input_device_settings.cc[diff]
chrome/browser/extensions/api/push_messaging/push_messaging_api.cc[diff]
chrome/browser/extensions/updater/extension_downloader.cc[diff]
chrome/browser/extensions/updater/extension_downloader.h[diff]
chrome/browser/extensions/updater/extension_downloader_delegate.cc[diff]
chrome/browser/extensions/updater/extension_downloader_delegate.h[diff]
chrome/browser/extensions/updater/extension_updater.cc[diff]
chrome/browser/extensions/updater/extension_updater.h[diff]
chrome/browser/extensions/updater/extension_updater_unittest.cc[diff]
chrome/browser/extensions/updater/manifest_fetch_data.cc[diff]
chrome/browser/extensions/updater/manifest_fetch_data.h[diff]
chrome/browser/io_thread.cc[diff]
chrome/browser/metrics/perf_provider_chromeos.cc[diff]
chrome/browser/net/chrome_network_delegate.cc[diff]
chrome/browser/net/chrome_network_delegate.h[diff]
chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc[diff]
chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h[diff]
chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc[diff]
chrome/browser/password_manager/password_manager_browsertest.cc[diff]
chrome/browser/prefs/tracked/pref_hash_browsertest.cc[diff]
chrome/browser/prefs/tracked/tracked_preferences_migration.cc[diff]
chrome/browser/printing/pdf_to_emf_converter.cc[diff]
chrome/browser/printing/pdf_to_emf_converter.h[diff]
chrome/browser/printing/print_preview_dialog_controller.cc[diff]
chrome/browser/printing/print_view_manager_base.cc[diff]
chrome/browser/printing/print_view_manager_base.h[diff]
chrome/browser/profiles/profile_android.cc[diff]
chrome/browser/profiles/profile_android.h[diff]
chrome/browser/profiles/profile_impl_io_data.cc[diff]
chrome/browser/profiles/profile_manager.cc[diff]
chrome/browser/profiles/profile_metrics.h[diff]
chrome/browser/renderer_context_menu/render_view_context_menu.cc[diff]
chrome/browser/resources/chromeos/chromevox/common/key_sequence.js[diff]
chrome/browser/resources/local_ntp/local_ntp.css[diff]
chrome/browser/resources/local_ntp/local_ntp.js[diff]
chrome/browser/resources/local_ntp/most_visited_thumbnail.css[diff]
chrome/browser/resources/local_ntp/most_visited_thumbnail.js[diff]
chrome/browser/resources/local_ntp/most_visited_util.js[diff]
chrome/browser/resources/plugin_metadata/plugins_win.json[diff]
chrome/browser/resources/sync_setup_overlay.js[diff]
chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc[diff]
chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc[diff]
chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc[diff]
chrome/browser/signin/easy_unlock_screenlock_state_handler.cc[diff]
chrome/browser/themes/browser_theme_pack.cc[diff]
chrome/browser/ui/android/website_settings_popup_android.cc[diff]
chrome/browser/ui/apps/chrome_app_delegate.cc[diff]
chrome/browser/ui/ash/launcher/browser_status_monitor.cc[diff]
chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc[diff]
chrome/browser/ui/cocoa/browser_window_controller.h[diff]
chrome/browser/ui/cocoa/browser_window_controller_private.mm[diff]
chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm[diff]
chrome/browser/ui/cocoa/tabs/tab_strip_controller.h[diff]
chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm[diff]
chrome/browser/ui/pdf/adobe_reader_info_win.cc[diff]
chrome/browser/ui/views/apps/chrome_native_app_window_views.cc[diff]
chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc[diff]
chrome/browser/ui/views/task_manager_view.cc[diff]
chrome/browser/ui/webui/certificate_viewer_webui.cc[diff]
chrome/browser/ui/webui/constrained_web_dialog_ui.h[diff]
chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc[diff]
chrome/browser/ui/webui/options/manage_profile_handler.cc[diff]
chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.cc[diff]
chrome/chrome.gyp[diff]
chrome/common/extensions/api/_manifest_features.json[diff]
chrome/common/extensions/api/_permission_features.json[diff]
chrome/common/extensions/api/push_messaging.idl[diff]
chrome/common/extensions/docs/templates/articles/cloudMessagingV1.html[diff]
chrome/common/extensions/docs/templates/articles/gcm_server.html[diff]
chrome/installer/mac/app_resource_rules.plist.in[diff]
chrome/service/DEPS[diff]
chrome/service/service_utility_process_host.cc[diff]
chrome_elf/blacklist/blacklist.cc[diff]
components/autofill/core/browser/autofill_external_delegate.cc[diff]
components/autofill/core/browser/autofill_manager.cc[diff]
components/autofill/core/browser/autofill_manager.h[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_params.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_params.h[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_params_unittest.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_settings.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_settings.h[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_settings_test_utils.h[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.cc[diff]
components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h[diff]
components/domain_reliability.gypi[diff]
components/domain_reliability/bake_in_configs.py[diff]
components/domain_reliability/baked_in_configs/accounts_google_com.json[diff]
components/domain_reliability/baked_in_configs/ad_doubleclick_net.json[diff]
components/domain_reliability/baked_in_configs/apis_google_com.json[diff]
components/domain_reliability/baked_in_configs/c_admob_com.json[diff]
components/domain_reliability/baked_in_configs/clients2_google_com.json[Added - diff]
components/domain_reliability/baked_in_configs/csi_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/ddm_google_com.json[diff]
components/domain_reliability/baked_in_configs/docs_google_com.json[diff]
components/domain_reliability/baked_in_configs/drive_google_com.json[diff]
components/domain_reliability/baked_in_configs/e_admob_com.json[diff]
components/domain_reliability/baked_in_configs/fonts_googleapis_com.json[diff]
components/domain_reliability/baked_in_configs/googleads4_g_doubleclick_net.json[diff]
components/domain_reliability/baked_in_configs/googleads_g_doubleclick_net.json[diff]
components/domain_reliability/baked_in_configs/gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/lh3_ggpht_com.json[diff]
components/domain_reliability/baked_in_configs/lh4_ggpht_com.json[diff]
components/domain_reliability/baked_in_configs/lh5_ggpht_com.json[diff]
components/domain_reliability/baked_in_configs/lh6_ggpht_com.json[diff]
components/domain_reliability/baked_in_configs/mail_google_com.json[diff]
components/domain_reliability/baked_in_configs/media_admob_com.json[diff]
components/domain_reliability/baked_in_configs/pagead2_googlesyndication_com.json[diff]
components/domain_reliability/baked_in_configs/partner_googleadservices_com.json[diff]
components/domain_reliability/baked_in_configs/pubads_g_doubleclick_net.json[diff]
components/domain_reliability/baked_in_configs/redirector_googlevideo_com.json[diff]
components/domain_reliability/baked_in_configs/s0_2mdn_net.json[diff]
components/domain_reliability/baked_in_configs/ssl_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/star_admob_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_doubleclick_net.json[Added - diff]
components/domain_reliability/baked_in_configs/star_g_doubleclick_net.json[Added - diff]
components/domain_reliability/baked_in_configs/star_ggpht_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_cn.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_co_uk.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_com_au.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_de.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_fr.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_it.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_jp.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_org.json[Added - diff]
components/domain_reliability/baked_in_configs/star_google_ru.json[Added - diff]
components/domain_reliability/baked_in_configs/star_googleadservices_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_googleapis_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_googlesyndication_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_googleusercontent_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_googlevideo_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_gstatic_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_gvt1_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_youtube_com.json[Added - diff]
components/domain_reliability/baked_in_configs/star_ytimg_com.json[Added - diff]
components/domain_reliability/baked_in_configs/t0_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/t1_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/t2_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/t3_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/themes_googleusercontent_com.json[diff]
components/domain_reliability/baked_in_configs/www_google_com.json[diff]
components/domain_reliability/baked_in_configs/www_googleadservices_com.json[diff]
components/domain_reliability/baked_in_configs/www_gstatic_com.json[diff]
components/domain_reliability/baked_in_configs/www_youtube_com.json[diff]
components/password_manager/core/browser/password_form_manager.cc[diff]
components/password_manager/core/browser/password_form_manager.h[diff]
components/password_manager/core/browser/password_form_manager_unittest.cc[diff]
components/renderer_context_menu/render_view_context_menu_base.cc[diff]
components/renderer_context_menu/render_view_context_menu_base.h[diff]
components/user_manager/user_manager_base.cc[diff]
content/browser/android/content_view_core_impl.cc[diff]
content/browser/devtools/render_view_devtools_agent_host.cc[diff]
content/browser/devtools/render_view_devtools_agent_host.h[diff]
content/browser/devtools/renderer_overrides_handler.cc[diff]
content/browser/devtools/renderer_overrides_handler.h[diff]
content/browser/media/android/browser_media_player_manager.cc[diff]
content/browser/media/android/browser_media_player_manager.h[diff]
content/browser/renderer_host/input/touch_selection_controller.cc[diff]
content/browser/renderer_host/input/touch_selection_controller.h[diff]
content/browser/renderer_host/input/touch_selection_controller_unittest.cc[diff]
content/browser/renderer_host/media/audio_sync_reader.cc[diff]
content/browser/renderer_host/render_widget_host_impl.cc[diff]
content/browser/renderer_host/render_widget_host_impl.h[diff]
content/browser/renderer_host/render_widget_host_view_android.cc[diff]
content/browser/renderer_host/render_widget_host_view_base.cc[diff]
content/browser/renderer_host/render_widget_host_view_base.h[diff]
content/browser/renderer_host/render_widget_host_view_mac.h[diff]
content/browser/renderer_host/render_widget_host_view_mac.mm[diff]
content/browser/web_contents/web_contents_android.cc[diff]
content/browser/web_contents/web_contents_android.h[diff]
content/common/gpu/media/dxva_video_decode_accelerator.cc[diff]
content/common/gpu/media/dxva_video_decode_accelerator.h[diff]
content/common_aidl.target.darwin-arm.mk[diff]
content/common_aidl.target.darwin-arm64.mk[diff]
content/common_aidl.target.darwin-mips.mk[diff]
content/common_aidl.target.darwin-x86.mk[diff]
content/common_aidl.target.darwin-x86_64.mk[diff]
content/common_aidl.target.linux-arm.mk[diff]
content/common_aidl.target.linux-arm64.mk[diff]
content/common_aidl.target.linux-mips.mk[diff]
content/common_aidl.target.linux-x86.mk[diff]
content/common_aidl.target.linux-x86_64.mk[diff]
content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java[diff]
content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java[diff]
content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java[diff]
content/public/android/java/src/org/chromium/content_public/browser/WebContents.java[diff]
content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java[diff]
content/renderer/media/webrtc_audio_capturer.cc[diff]
content/renderer/media/webrtc_audio_renderer.cc[diff]
content/renderer/media/webrtc_audio_renderer.h[diff]
content/renderer/media/webrtc_audio_renderer_unittest.cc[diff]
content/renderer/render_widget.cc[diff]
content/renderer/renderer_font_platform_win.cc[diff]
device/hid/hid_connection_mac.cc[diff]
device/hid/hid_connection_mac.h[diff]
device/serial/serial_io_handler.cc[diff]
google_apis/gcm/engine/connection_factory_impl.cc[diff]
gpu/command_buffer/service/async_pixel_transfer_manager_android.cc[diff]
gpu/command_buffer/service/in_process_command_buffer.cc[diff]
gpu/config/software_rendering_list_json.cc[diff]
ios/web/public/user_agent.mm[diff]
ipc/ipc_channel_win.cc[diff]
ipc/ipc_channel_win.h[diff]
jingle/glue/proxy_resolving_client_socket.cc[diff]
media/audio/audio_input_controller.cc[diff]
media/audio/audio_input_controller.h[diff]
media/audio/mac/audio_low_latency_input_mac.cc[diff]
media/audio/sample_rates.cc[diff]
media/audio/sample_rates.h[diff]
media/cast/sender/congestion_control.cc[diff]
media/filters/ffmpeg_demuxer.cc[diff]
media/filters/ffmpeg_demuxer_unittest.cc[diff]
native_client_sdk/src/README[diff]
native_client_sdk/src/build_tools/build_sdk.py[diff]
native_client_sdk/src/build_tools/build_version.py[diff]
native_client_sdk/src/build_tools/tests/build_version_test.py[Added - diff]
native_client_sdk/src/test_all.py[diff]
native_client_sdk/src/tools/getos.py[diff]
native_client_sdk/src/tools/tests/getos_test.py[diff]
net/base/network_delegate.cc[diff]
net/base/network_delegate.h[diff]
net/cert/ev_root_ca_metadata.cc[diff]
net/disk_cache/entry_unittest.cc[diff]
net/disk_cache/simple/simple_backend_impl.cc[diff]
net/disk_cache/simple/simple_backend_impl.h[diff]
net/disk_cache/simple/simple_entry_impl.cc[diff]
net/disk_cache/simple/simple_entry_impl.h[diff]
net/http/http_stream_factory_impl_job.cc[diff]
net/proxy/proxy_info.cc[diff]
net/proxy/proxy_info.h[diff]
net/proxy/proxy_info_unittest.cc[diff]
net/proxy/proxy_list.cc[diff]
net/proxy/proxy_list.h[diff]
net/proxy/proxy_list_unittest.cc[diff]
net/proxy/proxy_retry_info.h[diff]
net/proxy/proxy_service.cc[diff]
net/proxy/proxy_service.h[diff]
net/proxy/proxy_service_unittest.cc[diff]
printing/emf_win.cc[diff]
printing/emf_win.h[diff]
remoting/remoting_android.gypi[diff]
remoting/webapp/client_session.js[diff]
sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java[diff]
tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py[diff]
tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py[diff]
tools/chrome_proxy/integration_tests/chrome_proxy_metrics.py[diff]
tools/metrics/histograms/histograms.xml[diff]
ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java[diff]
ui/events/event.cc[diff]
ui/events/test/events_test_utils_x11.cc[diff]
ui/events/test/events_test_utils_x11.h[diff]
ui/events/x/events_x_unittest.cc[diff]
ui/events/x/touch_factory_x11.cc[diff]
ui/events/x/touch_factory_x11.h[diff]
ui/gfx/platform_font_pango.cc[diff]
ui/gfx/platform_font_pango.h[diff]
ui/gfx/render_text_pango.cc[diff]

330 files changed